From 3d6578cbaff06f0434066213e16477b1f8aa9d11 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Mon, 25 Mar 2013 09:35:17 +0000 Subject: [PATCH] * backwards-compatibility fixes --- .../net/sourceforge/filebot/web/TheTVDBClient.java | 14 +++++++++----- website/data/series-mappings.txt | 4 ++-- website/scripts/amc.groovy | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/source/net/sourceforge/filebot/web/TheTVDBClient.java b/source/net/sourceforge/filebot/web/TheTVDBClient.java index 6b442173..39473907 100644 --- a/source/net/sourceforge/filebot/web/TheTVDBClient.java +++ b/source/net/sourceforge/filebot/web/TheTVDBClient.java @@ -326,12 +326,16 @@ public class TheTVDBClient extends AbstractEpisodeListProvider { protected URL getResource(MirrorType mirrorType, String path) throws Exception { - // use default server - if (mirrorType == null) - return new URL("http", host, path); + if (mirrorType != null) { + // use mirror + String mirror = getMirror(mirrorType); + if (mirror != null && mirror.length() > 0) { + return new URL(mirror + path); + } + } - // use mirror - return new URL(getMirror(mirrorType) + path); + // use default server + return new URL("http", host, path); } diff --git a/website/data/series-mappings.txt b/website/data/series-mappings.txt index 78352f6e..534df8ab 100644 --- a/website/data/series-mappings.txt +++ b/website/data/series-mappings.txt @@ -1,6 +1,6 @@ HIMYM How I Met your Mother Hml8p Homeland hoc House of Cards -NCIS.LA NCIS: Los Angeles M.A.S.H M*A*S*H -MASH M*A*S*H \ No newline at end of file +MASH M*A*S*H +NCIS.LA NCIS: Los Angeles \ No newline at end of file diff --git a/website/scripts/amc.groovy b/website/scripts/amc.groovy index 25af5952..50c312fd 100644 --- a/website/scripts/amc.groovy +++ b/website/scripts/amc.groovy @@ -3,7 +3,7 @@ def input = [] def failOnError = _args.conflict == 'fail' // CHECK MINIMUM VERSION -// if (net.sourceforge.filebot.Settings.applicationRevisionNumber < 1540) { throw new Exception("Please update to FileBot v3.5 or higher") } +if (net.sourceforge.filebot.Settings.applicationRevisionNumber < 1540) { throw new Exception("Please update to FileBot v3.5 or higher") } // print input parameters _args.bindings?.each{ _log.fine("Parameter: $it.key = $it.value") }