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

Update TheMovieDB API client (credits, videos, etc) 

@see https://www.filebot.net/forums/viewtopic.php?f=6&t=5209
This commit is contained in:
Reinhard Pointner 2017-07-17 12:03:30 +08:00
parent 6f8cf7773e
commit 548f59decc
3 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,7 +172,7 @@ public class TMDbClient implements MovieIdentificationService, ArtworkProvider {
}
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") : emptyMap(), locale);
Object response = request("movie/" + id, extendedInfo ? singletonMap("append_to_response", "alternative_titles,release_dates,credits,videos") : emptyMap(), locale);
// read all basic movie properties
Map<MovieInfo.Property, String> fields = getEnumMap(response, MovieInfo.Property.class);
@ -230,24 +230,21 @@ public class TMDbClient implements MovieIdentificationService, ArtworkProvider {
Map<String, String> certifications = new LinkedHashMap<String, String>();
try {
String countryCode = locale.getCountry().isEmpty() ? "US" : locale.getCountry();
streamJsonObjects(getMap(response, "releases"), "countries").forEach(it -> {
streamJsonObjects(getMap(response, "release_dates"), "results").forEach(it -> {
String certificationCountry = getString(it, "iso_3166_1");
String certification = getString(it, "certification");
if (certification != null && certificationCountry != null) {
// add country specific certification code
if (countryCode.equals(certificationCountry)) {
fields.put(MovieInfo.Property.certification, certification);
}
// collect all certification codes just in case
certifications.put(certificationCountry, certification);
if (certificationCountry != null) {
streamJsonObjects(it, "release_dates").map(r -> getString(r, "certification")).filter(Objects::nonNull).findFirst().ifPresent(c -> {
// collect all certification codes just in case
certifications.put(certificationCountry, c);
});
}
});
} catch (Exception e) {
debug.warning(format("Bad data: certification => %s", response));
} finally {
// add country specific certification code as default certification value
String certificationCountry = locale.getCountry().isEmpty() ? "US" : locale.getCountry();
fields.put(MovieInfo.Property.certification, certifications.get(certificationCountry));
}
List<Person> cast = new ArrayList<Person>();
@ -255,7 +252,7 @@ public class TMDbClient implements MovieIdentificationService, ArtworkProvider {
// { "cast_id":20, "character":"Gandalf", "credit_id":"52fe4a87c3a368484e158bb7", "id":1327, "name":"Ian McKellen", "order":1, "profile_path":"/c51mP46oPgAgFf7bFWVHlScZynM.jpg" }
Function<String, String> normalize = s -> replaceSpace(s, " ").trim(); // user data may not be well-formed
Stream.of("cast", "crew").flatMap(section -> streamJsonObjects(getMap(response, "casts"), section)).map(it -> {
Stream.of("cast", "crew").flatMap(section -> streamJsonObjects(getMap(response, "credits"), section)).map(it -> {
String name = getStringValue(it, "name", normalize);
String character = getStringValue(it, "character", normalize);
String job = getStringValue(it, "job", normalize);
@ -271,18 +268,14 @@ public class TMDbClient implements MovieIdentificationService, ArtworkProvider {
List<Trailer> trailers = new ArrayList<Trailer>();
try {
Stream.of("quicktime", "youtube").forEach(section -> {
streamJsonObjects(getMap(response, "trailers"), section).map(it -> {
Map<String, String> sources = new LinkedHashMap<String, String>();
Stream.concat(Stream.of(it), streamJsonObjects(it, "sources")).forEach(source -> {
String size = getString(source, "size");
if (size != null) {
sources.put(size, getString(source, "source"));
}
});
return new Trailer(section, getString(it, "name"), sources);
}).forEach(trailers::add);
});
streamJsonObjects(getMap(response, "videos"), "results").map(it -> {
String type = getString(it, "type");
String name = getString(it, "name");
String site = getString(it, "site");
Integer size = getInteger(it, "size");
String lang = Stream.of("iso_639_1", "iso_3166_1").map(k -> getString(it, k)).filter(Objects::nonNull).collect(joining("_"));
return new Trailer(type, name, site, size, lang);
}).forEach(trailers::add);
} catch (Exception e) {
debug.warning(format("Bad data: trailers => %s", response));
}

21
source/net/filebot/web/Trailer.java
View File

@ -1,22 +1,25 @@
package net.filebot.web;
import java.io.Serializable;
import java.util.Map;
public class Trailer implements Serializable {
protected String type;
protected String name;
protected Map<String, String> sources;
protected String site;
protected Integer size;
protected String language;
public Trailer() {
// used by serializer
}
public Trailer(String type, String name, Map<String, String> sources) {
public Trailer(String type, String name, String site, Integer size, String language) {
this.type = type;
this.name = name;
this.sources = sources;
this.site = site;
this.size = size;
this.language = language;
}
public String getType() {
@ -27,17 +30,17 @@ public class Trailer implements Serializable {
return name;
}
public Map<String, String> getSources() {
return sources;
public Integer getSize() {
return size;
}
public String getSource(String size) {
return sources.containsKey(size) ? sources.get(size) : sources.values().iterator().next();
public String getLanguage() {
return language;
}
@Override
public String toString() {
return String.format("%s %s (%s)", name, sources.keySet(), type);
return String.format("%s [%s] [%s] [%s]", name, type, size, language);
}
}

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

@ -69,7 +69,7 @@ public class TMDbClientTest {
List<Movie> result = db.searchMovie("Suicide Squad", new Locale("es", "MX"));
Movie movie = result.get(0);
assertEquals("Escuadrón suicida", movie.getName());
assertEquals("Escuadrón Suicida", movie.getName());
assertEquals(2016, movie.getYear());
assertEquals(-1, movie.getImdbId());
assertEquals(297761, movie.getTmdbId());
@ -92,9 +92,11 @@ public class TMDbClientTest {
assertEquals("Transformers", movie.getName());
assertEquals("2007-06-27", movie.getReleased().toString());
assertEquals("PG-13", movie.getCertification());
assertEquals("{NL=12, FR=U, BG=C, TH=PG-13, DK=11, SE=15 År, GB=12A, KR=12세 관람가, HU=12, BR=10, AU=M, DE=12, GR=13, US=PG-13}", movie.getCertifications().toString());
assertEquals("[es, en]", movie.getSpokenLanguages().toString());
assertEquals("Shia LaBeouf", movie.getActors().get(0));
assertEquals("Michael Bay", movie.getDirector());
assertEquals("Trailer 2 [Trailer] [720] [en_US]", movie.getTrailers().get(0).toString());
}
@Test