From 41cd488bae262552367fc575ac2b16ebb9a420d4 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Wed, 4 Nov 2015 04:07:14 +0000
Subject: [PATCH] * catch XML-RPC errors

---
 source/net/filebot/subtitle/SubtitleUtilities.java | 8 +++++++-
 source/net/filebot/web/OpenSubtitlesClient.java    | 3 +--
 source/net/filebot/web/OpenSubtitlesXmlRpc.java    | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/source/net/filebot/subtitle/SubtitleUtilities.java b/source/net/filebot/subtitle/SubtitleUtilities.java
index 08b1c3e6..1b9afc54 100644
--- a/source/net/filebot/subtitle/SubtitleUtilities.java
+++ b/source/net/filebot/subtitle/SubtitleUtilities.java
@@ -26,6 +26,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.stream.Stream;
 
 import net.filebot.Language;
@@ -110,7 +112,11 @@ public final class SubtitleUtilities {
 				// try OpenSubtitles guess function if we can't make sense of the files using local search
 				if (selection.isEmpty()) {
 					for (File f : files) {
-						selection.addAll(service.guess(getName(f)));
+						try {
+							selection.addAll(service.guess(getName(f))); // !!! XML-RPC METHOD CURRENTLY BROKEN !!!
+						} catch (Exception e) {
+							Logger.getLogger(SubtitleUtilities.class.getName()).log(Level.WARNING, String.format("Failed to identify file [%s]: %s", f.getName(), e.getMessage()));
+						}
 					}
 				}
 
diff --git a/source/net/filebot/web/OpenSubtitlesClient.java b/source/net/filebot/web/OpenSubtitlesClient.java
index ae105a59..65c115a6 100644
--- a/source/net/filebot/web/OpenSubtitlesClient.java
+++ b/source/net/filebot/web/OpenSubtitlesClient.java
@@ -102,8 +102,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
 		// require login
 		login();
 
-		subtitles = xmlrpc.guessMovie(singleton(tag)).getOrDefault(tag, emptyList());
-		System.out.println(subtitles);
+		subtitles = xmlrpc.guessMovie(singleton(tag)).getOrDefault(tag, emptyList()); // XML-RPC METHOD BROKEN
 
 		getCache().putSearchResult("guess", tag, subtitles);
 		return subtitles;
diff --git a/source/net/filebot/web/OpenSubtitlesXmlRpc.java b/source/net/filebot/web/OpenSubtitlesXmlRpc.java
index e3dab90b..041e5756 100644
--- a/source/net/filebot/web/OpenSubtitlesXmlRpc.java
+++ b/source/net/filebot/web/OpenSubtitlesXmlRpc.java
@@ -233,6 +233,7 @@ public class OpenSubtitlesXmlRpc {
 		return subHashMap;
 	}
 
+	@Deprecated
 	public Map<String, List<SubtitleSearchResult>> guessMovie(Collection<String> tags) throws XmlRpcFault {
 		Map<String, List<SubtitleSearchResult>> results = new HashMap<String, List<SubtitleSearchResult>>();