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

* refactored "hash lookup not supported" logic

Browse Source
This commit is contained in:
Reinhard Pointner 2012-01-07 14:43:55 +00:00
parent 9f4eb944e9
commit e7d8e8bb05
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/net/sourceforge/filebot/cli/CmdlineOperations.java
View File

@ -270,9 +270,14 @@ public class CmdlineOperations implements CmdlineInterface {
if (movieFiles.length > 0 && query == null) { if (movieFiles.length > 0 && query == null) {
// match movie hashes online // match movie hashes online
CLILogger.fine(format("Looking up movie by filehash via [%s]", service.getName())); try {
movieByFileHash = service.getMovieDescriptors(movieFiles, locale); CLILogger.fine(format("Looking up movie by filehash via [%s]", service.getName()));
Analytics.trackEvent(service.getName(), "HashLookup", "Movie", movieByFileHash.length - frequency(asList(movieByFileHash), null)); // number of positive hash lookups movieByFileHash = service.getMovieDescriptors(movieFiles, locale);
Analytics.trackEvent(service.getName(), "HashLookup", "Movie", movieByFileHash.length - frequency(asList(movieByFileHash), null)); // number of positive hash lookups
} catch (UnsupportedOperationException e) {
CLILogger.fine(format("%s: Hash lookup not supported", service.getName()));
movieByFileHash = new Movie[movieFiles.length];
}
} }
if (subtitleFiles.length > 0 && movieFiles.length == 0) { if (subtitleFiles.length > 0 && movieFiles.length == 0) {

8
source/net/sourceforge/filebot/ui/rename/MovieHashMatcher.java
View File

@ -65,8 +65,12 @@ class MovieHashMatcher implements AutoCompleteMatcher {
if (movieFiles.length > 0) { if (movieFiles.length > 0) {
// match movie hashes online // match movie hashes online
movieByFileHash = service.getMovieDescriptors(movieFiles, locale); try {
Analytics.trackEvent(service.getName(), "HashLookup", "Movie", movieByFileHash.length - frequency(asList(movieByFileHash), null)); // number of positive hash lookups movieByFileHash = service.getMovieDescriptors(movieFiles, locale);
Analytics.trackEvent(service.getName(), "HashLookup", "Movie", movieByFileHash.length - frequency(asList(movieByFileHash), null)); // number of positive hash lookups
} catch (UnsupportedOperationException e) {
movieByFileHash = new Movie[movieFiles.length];
}
} else if (subtitleFiles.length > 0) { } else if (subtitleFiles.length > 0) {
// special handling if there is only subtitle files // special handling if there is only subtitle files
movieByFileHash = new Movie[subtitleFiles.length]; movieByFileHash = new Movie[subtitleFiles.length];

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

@ -203,7 +203,7 @@ public class IMDbClient extends AbstractEpisodeListProvider implements MovieIden
@Override @Override
public Movie[] getMovieDescriptors(File[] movieFiles, Locale locale) throws Exception { public Movie[] getMovieDescriptors(File[] movieFiles, Locale locale) throws Exception {
return new Movie[movieFiles.length]; // UNSUPPORTED OPERATION => EMPTY RESULT throw new UnsupportedOperationException();
} }
} }

3
source/net/sourceforge/filebot/web/TMDbClient.java
View File

@ -69,8 +69,7 @@ public class TMDbClient implements MovieIdentificationService {
public List<Movie> searchMovie(File file, Locale locale) throws IOException, SAXException { public List<Movie> searchMovie(File file, Locale locale) throws IOException, SAXException {
return emptyList(); // API BROKEN throw new UnsupportedOperationException();
// return searchMovie(OpenSubtitlesHasher.computeHash(file), file.length(), locale);
} }