moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-01-11 05:48:01 -05:00
Code Issues Releases Wiki Activity

Optimize TheMovieDB caching and default to using HTTPS instead of HTTP

Browse Source
This commit is contained in:
Reinhard Pointner 2016-03-12 10:01:11 +00:00
parent 730866f880
commit 0562f6bdfd
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/net/filebot/CachedResource.java
View File

@ -12,6 +12,9 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
import net.filebot.util.JsonUtilities; import net.filebot.util.JsonUtilities;
import net.filebot.web.WebRequest; import net.filebot.web.WebRequest;
@ -177,13 +180,11 @@ public class CachedResource<K, R> implements Resource<R> {
}; };
} }
public static Fetch fetchIfNoneMatch(Cache etagStorage) { public static Fetch fetchIfNoneMatch(Function<URL, Object> etagRetrieve, BiConsumer<URL, String> etagStore) {
return (url, lastModified) -> { return (url, lastModified) -> {
// record ETag response header // record ETag response header
Map<String, List<String>> responseHeaders = new HashMap<String, List<String>>(); Map<String, List<String>> responseHeaders = new HashMap<String, List<String>>();
Object etagValue = etagRetrieve.apply(url);
String etagKey = url.toString();
Object etagValue = etagStorage.get(etagKey);
try { try {
debug.fine(WebRequest.log(url, lastModified, etagValue)); debug.fine(WebRequest.log(url, lastModified, etagValue));
@ -197,7 +198,7 @@ public class CachedResource<K, R> implements Resource<R> {
} finally { } finally {
WebRequest.getETag(responseHeaders).ifPresent(etag -> { WebRequest.getETag(responseHeaders).ifPresent(etag -> {
debug.finest(format("Store ETag: %s", etag)); debug.finest(format("Store ETag: %s", etag));
etagStorage.put(etagKey, etag); etagStore.accept(url, etag);
}); });
} }
}; };

57
source/net/filebot/web/TMDbClient.java
View File

@ -34,6 +34,7 @@ import javax.swing.Icon;
import net.filebot.Cache; import net.filebot.Cache;
import net.filebot.CacheType; import net.filebot.CacheType;
import net.filebot.CachedResource.Fetch;
import net.filebot.Language; import net.filebot.Language;
import net.filebot.ResourceManager; import net.filebot.ResourceManager;
import net.filebot.web.TMDbClient.MovieInfo.MovieProperty; import net.filebot.web.TMDbClient.MovieInfo.MovieProperty;
@ -112,7 +113,7 @@ public class TMDbClient implements MovieIdentificationService {
if (extendedInfo) { if (extendedInfo) {
try { try {
Object titles = request("movie/" + id + "/alternative_titles", null, null, REQUEST_LIMIT); Object titles = request("movie/" + id + "/alternative_titles", emptyMap(), Locale.ENGLISH, REQUEST_LIMIT);
streamJsonObjects(titles, "titles").map(n -> { streamJsonObjects(titles, "titles").map(n -> {
return getString(n, "title"); return getString(n, "title");
}).filter(t -> t != null && t.length() >= 3).forEach(alternativeTitles::add); }).filter(t -> t != null && t.length() >= 3).forEach(alternativeTitles::add);
@ -167,7 +168,7 @@ public class TMDbClient implements MovieIdentificationService {
} }
public MovieInfo getMovieInfo(String id, Locale locale, boolean extendedInfo) throws Exception { public MovieInfo getMovieInfo(String id, Locale locale, boolean extendedInfo) throws Exception {
Object response = request("movie/" + id, extendedInfo ? singletonMap("append_to_response", "alternative_titles,releases,casts,trailers") : null, locale, REQUEST_LIMIT); Object response = request("movie/" + id, extendedInfo ? singletonMap("append_to_response", "alternative_titles,releases,casts,trailers") : emptyMap(), locale, REQUEST_LIMIT);
Map<MovieProperty, String> fields = getEnumMap(response, MovieProperty.class); Map<MovieProperty, String> fields = getEnumMap(response, MovieProperty.class);
@ -268,10 +269,10 @@ public class TMDbClient implements MovieIdentificationService {
public List<Artwork> getArtwork(String id) throws Exception { public List<Artwork> getArtwork(String id) throws Exception {
// http://api.themoviedb.org/3/movie/11/images // http://api.themoviedb.org/3/movie/11/images
Object config = request("configuration", null, null, REQUEST_LIMIT); Object config = request("configuration", emptyMap(), Locale.ENGLISH, REQUEST_LIMIT);
String baseUrl = getString(getMap(config, "images"), "base_url"); String baseUrl = getString(getMap(config, "images"), "base_url");
Object images = request("movie/" + id + "/images", null, null, REQUEST_LIMIT); Object images = request("movie/" + id + "/images", emptyMap(), Locale.ENGLISH, REQUEST_LIMIT);
return Stream.of("backdrops", "posters").flatMap(section -> { return Stream.of("backdrops", "posters").flatMap(section -> {
Stream<Artwork> artwork = streamJsonObjects(images, section).map(it -> { Stream<Artwork> artwork = streamJsonObjects(images, section).map(it -> {
@ -292,39 +293,37 @@ public class TMDbClient implements MovieIdentificationService {
public Object request(String resource, Map<String, Object> parameters, Locale locale, final FloodLimit limit) throws Exception { public Object request(String resource, Map<String, Object> parameters, Locale locale, final FloodLimit limit) throws Exception {
// default parameters // default parameters
LinkedHashMap<String, Object> data = new LinkedHashMap<String, Object>(); String key = parameters.isEmpty() ? resource : resource + '?' + encodeParameters(parameters, true);
if (parameters != null) {
data.putAll(parameters);
}
if (locale != null && locale.getLanguage().length() > 0) { Cache etagStorage = Cache.getCache(getName() + "_" + locale + "_etag", CacheType.Monthly);
String code = locale.getLanguage(); Fetch fetchIfNoneMatch = fetchIfNoneMatch(url -> etagStorage.get(key), (url, etag) -> etagStorage.put(key, etag));
// require 2-letter language code Cache cache = Cache.getCache(getName() + "_" + locale, CacheType.Monthly);
if (code.length() != 2) { Object json = cache.json(key, s -> getResource(s, locale)).fetch(withPermit(fetchIfNoneMatch, r -> limit.acquirePermit())).expire(Cache.ONE_WEEK).get();
Language lang = Language.getLanguage(locale);
if (lang != null) {
code = lang.getISO2();
}
}
data.put("language", code);
}
data.put("api_key", apikey);
Cache cache = Cache.getCache(getName(), CacheType.Monthly);
Cache etagStorage = Cache.getCache("etag", CacheType.Monthly);
String key = resource + '?' + encodeParameters(data, true);
Object json = cache.json(key, s -> getResource(s)).fetch(withPermit(fetchIfNoneMatch(etagStorage), r -> limit.acquirePermit())).expire(Cache.ONE_WEEK).get();
if (asMap(json).isEmpty()) { if (asMap(json).isEmpty()) {
throw new FileNotFoundException(String.format("Resource is empty: %s => %s", json, getResource(key))); throw new FileNotFoundException(String.format("Resource is empty: %s => %s", json, getResource(key, locale)));
} }
return json; return json;
} }
public URL getResource(String file) throws Exception { protected URL getResource(String file, Locale locale) throws Exception {
return new URL("http", host, "/" + version + "/" + file); return new URL("https", host, "/" + version + "/" + file + (file.lastIndexOf('?') < 0 ? '?' : '&') + "language=" + getLanguageCode(locale) + "&api_key=" + apikey);
}
protected String getLanguageCode(Locale locale) {
// require 2-letter language code
String language = locale.getLanguage();
if (language.length() == 2) {
return language;
}
Language lang = Language.getLanguage(locale);
if (lang != null) {
return lang.getISO2();
}
throw new IllegalArgumentException("Illegal language code: " + language);
} }
public static class MovieInfo implements Serializable { public static class MovieInfo implements Serializable {

2
test/net/filebot/web/TMDbClientTest.java
View File

@ -108,7 +108,7 @@ public class TMDbClientTest {
public void etag() throws Exception { public void etag() throws Exception {
Cache cache = Cache.getCache("test", CacheType.Persistent); Cache cache = Cache.getCache("test", CacheType.Persistent);
Cache etagStorage = Cache.getCache("etag", CacheType.Persistent); Cache etagStorage = Cache.getCache("etag", CacheType.Persistent);
CachedResource<String, byte[]> resource = cache.bytes("http://devel.squid-cache.org/old_projects.html#etag", URL::new).fetch(fetchIfNoneMatch(etagStorage)).expire(Duration.ZERO); CachedResource<String, byte[]> resource = cache.bytes("http://devel.squid-cache.org/old_projects.html#etag", URL::new).fetch(fetchIfNoneMatch(etagStorage::get, etagStorage::put)).expire(Duration.ZERO);
assertArrayEquals(resource.get(), resource.get()); assertArrayEquals(resource.get(), resource.get());
} }