From d0faaad55a0b0b04bba794832613e4a9661420f7 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Fri, 3 Jul 2009 17:49:28 +0000
Subject: [PATCH] * provide link in OpenSubtitlesClient * refactoring

---
 .../filebot/ui/panel/subtitle/SubtitlePanel.java   | 13 +++++--------
 .../filebot/web/OpenSubtitlesClient.java           | 14 ++++++++++++--
 .../web/OpenSubtitlesSubtitleDescriptor.java       |  3 ++-
 .../filebot/web/OpenSubtitlesXmlRpc.java           |  3 +--
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitlePanel.java b/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitlePanel.java
index 76a9ac79..a1edf0ff 100644
--- a/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitlePanel.java
+++ b/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitlePanel.java
@@ -105,24 +105,21 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
 		String text = searchTextField.getText().trim();
 		Language language = languageModel.getSelectedItem();
 		
-		// null or proper language name
-		String languageName = (language == ALL_LANGUAGES ? null : language.getName());
-		
-		return new SubtitleRequestProcessor(new SubtitleRequest(provider, text, languageName));
+		return new SubtitleRequestProcessor(new SubtitleRequest(provider, text, language));
 	}
 	
 
 	protected static class SubtitleRequest extends Request {
 		
 		private final SubtitleProvider provider;
-		private final String languageName;
+		private final Language language;
 		
 
-		public SubtitleRequest(SubtitleProvider provider, String searchText, String languageName) {
+		public SubtitleRequest(SubtitleProvider provider, String searchText, Language language) {
 			super(searchText);
 			
 			this.provider = provider;
-			this.languageName = languageName;
+			this.language = language;
 		}
 		
 
@@ -132,7 +129,7 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
 		
 
 		public String getLanguageName() {
-			return languageName;
+			return language == ALL_LANGUAGES ? null : language.getName();
 		}
 		
 	}
diff --git a/source/net/sourceforge/filebot/web/OpenSubtitlesClient.java b/source/net/sourceforge/filebot/web/OpenSubtitlesClient.java
index af2599b3..c83f6737 100644
--- a/source/net/sourceforge/filebot/web/OpenSubtitlesClient.java
+++ b/source/net/sourceforge/filebot/web/OpenSubtitlesClient.java
@@ -71,8 +71,18 @@ public class OpenSubtitlesClient implements SubtitleProvider {
 
 	@Override
 	public URI getSubtitleListLink(SearchResult searchResult, String languageName) {
-		//TODO provide link
-		return null;
+		MovieDescriptor movie = (MovieDescriptor) searchResult;
+		String sublanguageid = "all";
+		
+		if (languageName != null) {
+			try {
+				sublanguageid = getSubLanguageID(languageName);
+			} catch (Exception e) {
+				Logger.getLogger(getClass().getName()).log(Level.WARNING, e.getMessage(), e);
+			}
+		}
+		
+		return URI.create(String.format("http://www.opensubtitles.org/en/search/imdbid-%d/sublanguageid-%s", movie.getImdbId(), sublanguageid));
 	}
 	
 
diff --git a/source/net/sourceforge/filebot/web/OpenSubtitlesSubtitleDescriptor.java b/source/net/sourceforge/filebot/web/OpenSubtitlesSubtitleDescriptor.java
index e2b00143..71557f82 100644
--- a/source/net/sourceforge/filebot/web/OpenSubtitlesSubtitleDescriptor.java
+++ b/source/net/sourceforge/filebot/web/OpenSubtitlesSubtitleDescriptor.java
@@ -11,6 +11,7 @@ import java.util.Map.Entry;
 import java.util.zip.GZIPInputStream;
 
 import net.sourceforge.tuned.ByteBufferOutputStream;
+import net.sourceforge.tuned.FileUtilities;
 
 
 /**
@@ -85,7 +86,7 @@ public class OpenSubtitlesSubtitleDescriptor implements SubtitleDescriptor {
 
 	@Override
 	public String getName() {
-		return getProperty(Property.MovieReleaseName);
+		return FileUtilities.getNameWithoutExtension(getProperty(Property.SubFileName));
 	}
 	
 
diff --git a/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java b/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java
index 3bc624cd..93eb1a1d 100644
--- a/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java
+++ b/source/net/sourceforge/filebot/web/OpenSubtitlesXmlRpc.java
@@ -141,8 +141,7 @@ public class OpenSubtitlesXmlRpc {
 				subtitles.add(new OpenSubtitlesSubtitleDescriptor(Property.asEnumMap(subtitleData)));
 			}
 		} catch (ClassCastException e) {
-			// if the response is an error message, generic types won't match 
-			throw new XmlRpcException("Illegal response: " + response.toString());
+			// error response, no subtitles, ignore
 		}
 		
 		return subtitles;