mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* persistent cache for subLanguageID map

This commit is contained in:
Reinhard Pointner 2011-12-13 12:34:34 +00:00
parent c1ed273158
commit 506a2938ac
1 changed files with 51 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
source/net/sourceforge/filebot/web/OpenSubtitlesClient.java
View File

@ -3,7 +3,6 @@ package net.sourceforge.filebot.web;
import static java.lang.Math.*; import static java.lang.Math.*;
import static java.util.Collections.*;
import static net.sourceforge.filebot.web.OpenSubtitlesHasher.*; import static net.sourceforge.filebot.web.OpenSubtitlesHasher.*;
import java.io.File; import java.io.File;
@ -18,7 +17,6 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.TreeMap;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.logging.Level; import java.util.logging.Level;
@ -28,6 +26,9 @@ import javax.swing.Icon;
import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcException;
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
import net.sourceforge.filebot.ResourceManager; import net.sourceforge.filebot.ResourceManager;
import net.sourceforge.filebot.web.OpenSubtitlesXmlRpc.Query; import net.sourceforge.filebot.web.OpenSubtitlesXmlRpc.Query;
import net.sourceforge.tuned.Timer; import net.sourceforge.tuned.Timer;
@ -40,30 +41,30 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
private final OpenSubtitlesXmlRpc xmlrpc; private final OpenSubtitlesXmlRpc xmlrpc;
public OpenSubtitlesClient(String useragent) { public OpenSubtitlesClient(String useragent) {
this.xmlrpc = new OpenSubtitlesXmlRpc(useragent); this.xmlrpc = new OpenSubtitlesXmlRpc(useragent);
} }
@Override @Override
public String getName() { public String getName() {
return "OpenSubtitles"; return "OpenSubtitles";
} }
@Override @Override
public URI getLink() { public URI getLink() {
return URI.create("http://www.opensubtitles.org"); return URI.create("http://www.opensubtitles.org");
} }
@Override @Override
public Icon getIcon() { public Icon getIcon() {
return ResourceManager.getIcon("search.opensubtitles"); return ResourceManager.getIcon("search.opensubtitles");
} }
@Override @Override
public List<SearchResult> search(String query) throws Exception { public List<SearchResult> search(String query) throws Exception {
// require login // require login
@ -79,7 +80,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
} }
} }
@Override @Override
public List<SubtitleDescriptor> getSubtitleList(SearchResult searchResult, String languageName) throws Exception { public List<SubtitleDescriptor> getSubtitleList(SearchResult searchResult, String languageName) throws Exception {
// singleton array with or empty array // singleton array with or empty array
@ -95,7 +96,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return Arrays.asList(subtitles); return Arrays.asList(subtitles);
} }
public Map<File, List<SubtitleDescriptor>> getSubtitleList(File[] files, String languageName) throws Exception { public Map<File, List<SubtitleDescriptor>> getSubtitleList(File[] files, String languageName) throws Exception {
// singleton array with or empty array // singleton array with or empty array
String[] languageFilter = languageName != null ? new String[] { getSubLanguageID(languageName) } : new String[0]; String[] languageFilter = languageName != null ? new String[] { getSubLanguageID(languageName) } : new String[0];
@ -142,14 +143,14 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return resultMap; return resultMap;
} }
@Override @Override
public boolean publishSubtitle(int imdbid, String languageName, File videoFile, File subtitleFile) throws Exception { public boolean publishSubtitle(int imdbid, String languageName, File videoFile, File subtitleFile) throws Exception {
//TODO implement upload feature //TODO implement upload feature
return false; return false;
} }
/** /**
* Calculate MD5 hash. * Calculate MD5 hash.
*/ */
@ -163,7 +164,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
} }
} }
@Override @Override
public List<Movie> searchMovie(String query, Locale locale) throws Exception { public List<Movie> searchMovie(String query, Locale locale) throws Exception {
// require login // require login
@ -172,7 +173,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return xmlrpc.searchMoviesOnIMDB(query); return xmlrpc.searchMoviesOnIMDB(query);
} }
@Override @Override
public Movie getMovieDescriptor(int imdbid, Locale locale) throws Exception { public Movie getMovieDescriptor(int imdbid, Locale locale) throws Exception {
// require login // require login
@ -181,7 +182,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return xmlrpc.getIMDBMovieDetails(imdbid); return xmlrpc.getIMDBMovieDetails(imdbid);
} }
@Override @Override
public Movie[] getMovieDescriptors(File[] movieFiles, Locale locale) throws Exception { public Movie[] getMovieDescriptors(File[] movieFiles, Locale locale) throws Exception {
// create result array // create result array
@ -216,7 +217,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return result; return result;
} }
@Override @Override
public URI getSubtitleListLink(SearchResult searchResult, String languageName) { public URI getSubtitleListLink(SearchResult searchResult, String languageName) {
Movie movie = (Movie) searchResult; Movie movie = (Movie) searchResult;
@ -233,7 +234,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return URI.create(String.format("http://www.opensubtitles.org/en/search/imdbid-%d/sublanguageid-%s", movie.getImdbId(), sublanguageid)); return URI.create(String.format("http://www.opensubtitles.org/en/search/imdbid-%d/sublanguageid-%s", movie.getImdbId(), sublanguageid));
} }
public Locale detectLanguage(byte[] data) throws Exception { public Locale detectLanguage(byte[] data) throws Exception {
// require login // require login
login(); login();
@ -245,7 +246,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return languages.size() > 0 ? new Locale(languages.get(0)) : null; return languages.size() > 0 ? new Locale(languages.get(0)) : null;
} }
protected synchronized void login() throws Exception { protected synchronized void login() throws Exception {
if (!xmlrpc.isLoggedOn()) { if (!xmlrpc.isLoggedOn()) {
xmlrpc.loginAnonymous(); xmlrpc.loginAnonymous();
@ -254,7 +255,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
logoutTimer.set(10, TimeUnit.MINUTES, true); logoutTimer.set(10, TimeUnit.MINUTES, true);
} }
protected synchronized void logout() { protected synchronized void logout() {
if (xmlrpc.isLoggedOn()) { if (xmlrpc.isLoggedOn()) {
try { try {
@ -267,7 +268,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
logoutTimer.cancel(); logoutTimer.cancel();
} }
protected final Timer logoutTimer = new Timer() { protected final Timer logoutTimer = new Timer() {
@Override @Override
@ -276,44 +277,57 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
} }
}; };
/** /**
* SubLanguageID by English language name * SubLanguageID by English language name
*/ */
private static final Map<String, String> subLanguageCache = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER); @SuppressWarnings("unchecked")
protected synchronized Map<String, String> getSubLanguageMap() throws Exception { protected synchronized Map<String, String> getSubLanguageMap() throws Exception {
synchronized (subLanguageCache) { Cache cache = CacheManager.getInstance().getCache("web-persistent-datasource");
if (subLanguageCache.isEmpty()) { String key = getClass().getName() + ".getSubLanguageMap";
for (Entry<String, String> entry : xmlrpc.getSubLanguages().entrySet()) {
// map id by name Element element = cache.get(key);
subLanguageCache.put(entry.getValue(), entry.getKey()); Map<String, String> subLanguageMap;
}
if (element == null) {
// some additional special handling subLanguageMap = new HashMap<String, String>();
subLanguageCache.put("Brazilian", "pob");
// fetch language data
for (Entry<String, String> entry : xmlrpc.getSubLanguages().entrySet()) {
// map id by name
subLanguageMap.put(entry.getValue().toLowerCase(), entry.getKey().toLowerCase());
} }
return unmodifiableMap(subLanguageCache); // some additional special handling
subLanguageMap.put("brazilian", "pob");
// cache data
cache.put(new Element(key, subLanguageMap));
} else {
// use cached entry
subLanguageMap = (Map<String, String>) element.getValue();
} }
return subLanguageMap;
} }
protected String getSubLanguageID(String languageName) throws Exception { protected String getSubLanguageID(String languageName) throws Exception {
if (!getSubLanguageMap().containsKey(languageName)) { if (!getSubLanguageMap().containsKey(languageName.toLowerCase())) {
throw new IllegalArgumentException(String.format("SubLanguageID for '%s' not found", languageName)); throw new IllegalArgumentException(String.format("SubLanguageID for '%s' not found", languageName));
} }
return getSubLanguageMap().get(languageName); return getSubLanguageMap().get(languageName.toLowerCase());
} }
protected String getLanguageName(String subLanguageID) throws Exception { protected String getLanguageName(String subLanguageID) throws Exception {
for (Entry<String, String> it : getSubLanguageMap().entrySet()) { for (Entry<String, String> it : getSubLanguageMap().entrySet()) {
if (it.getValue().equals(subLanguageID)) if (it.getValue().equals(subLanguageID.toLowerCase()))
return it.getKey(); return it.getKey();
} }
return null; return null;
} }
} }