From 2ad88bd306e3e51e733825930ac1852b35d51e2d Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 28 Jan 2014 09:39:22 +0000 Subject: [PATCH] * fix subtitles-not-found issue caused by the limit of 500. The limit should now be 2000 and effectively not ever be an issue again --- .../filebot/web/OpenSubtitlesSubtitleDescriptor.java | 2 +- .../net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java | 2 +- .../sourceforge/filebot/web/OpenSubtitlesXmlRpcTest.java | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/source/net/sourceforge/filebot/web/OpenSubtitlesSubtitleDescriptor.java b/source/net/sourceforge/filebot/web/OpenSubtitlesSubtitleDescriptor.java index 8d4c6d2f..195fb608 100644 --- a/source/net/sourceforge/filebot/web/OpenSubtitlesSubtitleDescriptor.java +++ b/source/net/sourceforge/filebot/web/OpenSubtitlesSubtitleDescriptor.java @@ -108,7 +108,7 @@ public class OpenSubtitlesSubtitleDescriptor implements SubtitleDescriptor, Seri try { stream = new GZIPInputStream(stream); } catch (ZipException e) { - throw new IOException(String.format("%s: anti-leech limit may have been reached", e.getMessage())); + throw new IOException(String.format("%s: anti-leech limit has been reached", e.getMessage())); } // fully download diff --git a/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java b/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java index 2b51d73c..13082990 100644 --- a/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java +++ b/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java @@ -96,7 +96,7 @@ public class OpenSubtitlesXmlRpc { @SuppressWarnings("unchecked") public List searchSubtitles(Collection queryList) throws XmlRpcFault { List subtitles = new ArrayList(); - Map response = invoke("SearchSubtitles", token, queryList); + Map response = invoke("SearchSubtitles", token, queryList, singletonMap("limit", 2000)); try { List> subtitleData = (List>) response.get("data"); diff --git a/test/net/sourceforge/filebot/web/OpenSubtitlesXmlRpcTest.java b/test/net/sourceforge/filebot/web/OpenSubtitlesXmlRpcTest.java index ecf69a9c..205ded86 100644 --- a/test/net/sourceforge/filebot/web/OpenSubtitlesXmlRpcTest.java +++ b/test/net/sourceforge/filebot/web/OpenSubtitlesXmlRpcTest.java @@ -177,6 +177,15 @@ public class OpenSubtitlesXmlRpcTest { assertEquals(48717, data.remaining(), 0); } + // @Test(expected = IOException.class) + public void fetchSubtitlesExceedLimit() throws Exception { + List list = xmlrpc.searchSubtitles(773262, "eng"); + + for (int i = 0; true; i++) { + System.out.format("Fetch #%d: %s%n", i, list.get(i).fetch()); + } + } + @AfterClass public static void logout() throws Exception { // logout manually