moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-23 00:08:51 -05:00
Code Issues Releases Wiki Activity

Optimize TMDB local index search

Browse Source
This commit is contained in:
Reinhard Pointner 2019-01-29 19:04:06 +07:00
parent e3ee25879b
commit fdce2c8c72
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/net/filebot/WebServices.java
View File

@ -9,13 +9,13 @@ import static net.filebot.media.MediaDetection.*;
import static net.filebot.util.FileUtilities.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@ -136,31 +136,28 @@ public final class WebServices {
}
// local TheMovieDB search index
private final Map<Integer, LocalSearch<Movie>> localIndexPerYear = new ConcurrentHashMap<>(64);
private final Map<Integer, Resource<LocalSearch<Movie>>> localIndexPerYear = synchronizedMap(new HashMap<>(64));
private LocalSearch<Movie> getLocalIndexByYear(int year) {
return localIndexPerYear.computeIfAbsent(year, y -> {
try {
private LocalSearch<Movie> computeLocalIndex(int year) throws Exception {
if (year > 0) {
// limit search index to a given year (so we don't have to check all movies of all time all the time)
Movie[] movies = stream(releaseInfo.getMovieList()).filter(m -> year == m.getYear()).toArray(Movie[]::new);
// search by primary movie name and all known alias names
return new LocalSearch<>(movies, Movie::getEffectiveNamesWithoutYear);
} catch (Exception e) {
throw new RuntimeException(e);
}
});
}
private LocalSearch<Movie> getLocalIndex() throws Exception {
return localIndexPerYear.computeIfAbsent(0, y -> {
try {
} else {
// check all movies of all time if release year is not known (but only compare to primary title for performance reasons)
return new LocalSearch<>(releaseInfo.getMovieList(), m -> singleton(m.getName()));
} catch (Exception e) {
throw new RuntimeException(e);
}
}
private LocalSearch<Movie> getLocalIndex(int year) throws Exception {
Resource<LocalSearch<Movie>> index = localIndexPerYear.computeIfAbsent(year, y -> {
return Resource.lazy(() -> computeLocalIndex(y));
});
// make sure that LocalSearch initialization happens outside of the synchronized map
return index.get();
}
@Override
@ -173,12 +170,12 @@ public final class WebServices {
if (movieYear > 0) {
// the year might be off by 1 so we also check movies from the previous year and the next year
searches.add(() -> getLocalIndexByYear(movieYear).search(movieName));
searches.add(() -> getLocalIndexByYear(movieYear - 1).search(movieName));
searches.add(() -> getLocalIndexByYear(movieYear + 1).search(movieName));
searches.add(() -> getLocalIndex(movieYear).search(movieName));
searches.add(() -> getLocalIndex(movieYear - 1).search(movieName));
searches.add(() -> getLocalIndex(movieYear + 1).search(movieName));
} else {
// search all movies of all years if year is unknown
searches.add(() -> getLocalIndex().search(movieName));
searches.add(() -> getLocalIndex(0).search(movieName));
}
// combine alias names into a single search results, and keep API search name as primary name