From 84fbad6ab3014bd2a8f4fdbcd3fb290bd75cf27b Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 8 Jul 2012 10:34:52 +0000 Subject: [PATCH] * fuck stupid sublight for restricting their api --- source/net/sourceforge/filebot/Settings.properties | 3 --- source/net/sourceforge/filebot/WebServices.java | 6 ++---- .../sourceforge/filebot/web/SublightSubtitleClientTest.java | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/source/net/sourceforge/filebot/Settings.properties b/source/net/sourceforge/filebot/Settings.properties index 9b396b38..de69e8ab 100644 --- a/source/net/sourceforge/filebot/Settings.properties +++ b/source/net/sourceforge/filebot/Settings.properties @@ -13,6 +13,3 @@ analytics.WebPropertyID: UA-25379256-3 thetvdb.apikey: 58B4AA94C59AD656 themoviedb.apikey: 5a6edae568130bf10617b6d45be99f13 serienjunkies.apikey: 9fbhw9uebfiwvbefzuwv - -sublight.clientid: Sublight;3.6.0 -sublight.apikey: YYa4Yajnqm5kXCEaetZeybYlfMIuGiJyTqqn0gfQv+mzC1KYEZq7jThuAFRehbti6d50PTqpBIy5wtfTyrMTb0IHWrGxDQHnHzcrtA8CO+337RhjZgw3OZsvJ/bJmd7ZAJbYMDoG/JXGYqpDFg38MteayjAZtQpNECUwZsbiuis= diff --git a/source/net/sourceforge/filebot/WebServices.java b/source/net/sourceforge/filebot/WebServices.java index f41849a6..791e48bb 100644 --- a/source/net/sourceforge/filebot/WebServices.java +++ b/source/net/sourceforge/filebot/WebServices.java @@ -10,7 +10,6 @@ import net.sourceforge.filebot.web.IMDbClient; import net.sourceforge.filebot.web.MovieIdentificationService; import net.sourceforge.filebot.web.OpenSubtitlesClient; import net.sourceforge.filebot.web.SerienjunkiesClient; -import net.sourceforge.filebot.web.SublightSubtitleClient; import net.sourceforge.filebot.web.SubsceneSubtitleClient; import net.sourceforge.filebot.web.SubtitleProvider; import net.sourceforge.filebot.web.TMDbClient; @@ -32,7 +31,6 @@ public final class WebServices { // subtitle dbs public static final OpenSubtitlesClient OpenSubtitles = new OpenSubtitlesClient(String.format("%s %s", getApplicationName(), getApplicationVersion())); - public static final SublightSubtitleClient Sublight = new SublightSubtitleClient(getApplicationProperty("sublight.clientid"), getApplicationProperty("sublight.apikey")); public static final SubsceneSubtitleClient Subscene = new SubsceneSubtitleClient(); // movie dbs @@ -51,12 +49,12 @@ public final class WebServices { public static SubtitleProvider[] getSubtitleProviders() { - return new SubtitleProvider[] { OpenSubtitles, Sublight, Subscene }; + return new SubtitleProvider[] { OpenSubtitles, Subscene }; } public static VideoHashSubtitleService[] getVideoHashSubtitleServices() { - return new VideoHashSubtitleService[] { OpenSubtitles, Sublight }; + return new VideoHashSubtitleService[] { OpenSubtitles }; } diff --git a/test/net/sourceforge/filebot/web/SublightSubtitleClientTest.java b/test/net/sourceforge/filebot/web/SublightSubtitleClientTest.java index ca3974ab..b0c995b1 100644 --- a/test/net/sourceforge/filebot/web/SublightSubtitleClientTest.java +++ b/test/net/sourceforge/filebot/web/SublightSubtitleClientTest.java @@ -2,7 +2,6 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.Settings.*; import static org.junit.Assert.*; import java.io.ByteArrayInputStream; @@ -19,7 +18,7 @@ import net.sublight.webservice.Subtitle; public class SublightSubtitleClientTest { - private static SublightSubtitleClient client = new SublightSubtitleClient(getApplicationProperty("sublight.clientid"), getApplicationProperty("sublight.apikey")); + private static SublightSubtitleClient client = new SublightSubtitleClient(null, null); // BROKEN SINCE SUBLIGHT RESTRICTED API ACCESS @BeforeClass