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

* OSDB: also cache negative search results

This commit is contained in:
Reinhard Pointner 2013-03-30 11:02:51 +00:00
parent db820647af
commit ad2bbbdabb
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/net/sourceforge/filebot/cli/ArgumentBean.java
View File

@ -190,7 +190,7 @@ public class ArgumentBean {
public File getLogFile() throws IOException { public File getLogFile() throws IOException {
File f = new File(output, logFile).getAbsoluteFile(); File f = new File(logFile).getAbsoluteFile();
if (!f.exists() && !f.getParentFile().mkdirs() && !f.createNewFile()) { if (!f.exists() && !f.getParentFile().mkdirs() && !f.createNewFile()) {
throw new IOException("Failed to create log file: " + f); throw new IOException("Failed to create log file: " + f);
} }

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

@ -16,11 +16,13 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList; 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.Map.Entry; import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -264,10 +266,9 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
Movie entry = getCache().getData("getMovieDescriptor", hash, locale, Movie.class); Movie entry = getCache().getData("getMovieDescriptor", hash, locale, Movie.class);
if (entry == null) { if (entry == null) {
hashMap.put(hash, file); // map file by hash hashMap.put(hash, file); // map file by hash
} else { } else if (entry.getName().length() > 0) {
result.put(file, entry); result.put(file, entry);
} }
} }
} }
@ -280,13 +281,25 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
int batchSize = 50; int batchSize = 50;
for (int bn = 0; bn < ceil((float) hashes.size() / batchSize); bn++) { for (int bn = 0; bn < ceil((float) hashes.size() / batchSize); bn++) {
List<String> batch = hashes.subList(bn * batchSize, min((bn * batchSize) + batchSize, hashes.size())); List<String> batch = hashes.subList(bn * batchSize, min((bn * batchSize) + batchSize, hashes.size()));
Set<String> unmatchedHashes = new HashSet<String>(batch);
int minSeenCount = 20; // make sure we don't get mismatches by making sure the hash has not been confirmed numerous times int minSeenCount = 20; // make sure we don't get mismatches by making sure the hash has not been confirmed numerous times
for (Entry<String, Movie> it : xmlrpc.checkMovieHash(batch, minSeenCount).entrySet()) { for (Entry<String, Movie> it : xmlrpc.checkMovieHash(batch, minSeenCount).entrySet()) {
result.put(hashMap.get(it.getKey()), it.getValue()); String hash = it.getKey();
getCache().putData("getMovieDescriptor", it.getKey(), locale, it.getValue()); Movie movie = it.getValue();
result.put(hashMap.get(hash), movie);
getCache().putData("getMovieDescriptor", hash, locale, movie);
unmatchedHashes.remove(hash);
}
// note hashes that are not matched to any items so we can ignore them in the future
for (String hash : unmatchedHashes) {
getCache().putData("getMovieDescriptor", hash, locale, new Movie("", -1, -1, -1));
} }
} }
} }
return result; return result;
@ -357,7 +370,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
protected synchronized Map<String, String> getSubLanguageMap() throws Exception { protected synchronized Map<String, String> getSubLanguageMap() throws Exception {
Cache cache = Cache.getCache("web-persistent-datasource"); Cache cache = Cache.getCache("web-datasource-lv2");
String cacheKey = getClass().getName() + ".subLanguageMap"; String cacheKey = getClass().getName() + ".subLanguageMap";
Map<String, String> subLanguageMap = cache.get(cacheKey, Map.class); Map<String, String> subLanguageMap = cache.get(cacheKey, Map.class);

2
source/net/sourceforge/filebot/web/SubsceneSubtitleClient.java
View File

@ -126,7 +126,7 @@ public class SubsceneSubtitleClient implements SubtitleProvider {
} }
// try cache first // try cache first
Cache cache = Cache.getCache("web-persistent-datasource"); Cache cache = Cache.getCache("web-datasource-lv2");
String cacheKey = getClass().getName() + ".languageFilter"; String cacheKey = getClass().getName() + ".languageFilter";
Map<String, String> filters = cache.get(cacheKey, Map.class); Map<String, String> filters = cache.get(cacheKey, Map.class);