From 03ab54ddccda8b7543210ed260aba451d43737c4 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 9 Oct 2012 17:36:21 +0000 Subject: [PATCH] * fck osdb moviehash collisions --- source/net/sourceforge/filebot/cli/CmdlineOperations.java | 4 ++-- source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/net/sourceforge/filebot/cli/CmdlineOperations.java b/source/net/sourceforge/filebot/cli/CmdlineOperations.java index 6e7d7cbd..acd85cb5 100644 --- a/source/net/sourceforge/filebot/cli/CmdlineOperations.java +++ b/source/net/sourceforge/filebot/cli/CmdlineOperations.java @@ -323,12 +323,12 @@ public class CmdlineOperations implements CmdlineInterface { if (query == null) { if (movieFiles.size() > 0) { try { - CLILogger.fine(format("Looking up movie by filehash via [%s]", service.getName())); + CLILogger.finest(format("Looking up movie by filehash via [%s]", service.getName())); Map hashLookup = service.getMovieDescriptors(movieFiles, locale); movieByFile.putAll(hashLookup); Analytics.trackEvent(service.getName(), "HashLookup", "Movie", hashLookup.size()); // number of positive hash lookups } catch (UnsupportedOperationException e) { - CLILogger.fine(format("%s: Hash lookup not supported", service.getName())); + CLILogger.finest(format("%s: Hash lookup not supported", service.getName())); } } diff --git a/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy b/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy index c7a19867..6d6eaad6 100644 --- a/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy +++ b/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy @@ -202,7 +202,7 @@ def detectSeriesName(files, locale = Locale.ENGLISH) { return names == null || names.isEmpty() ? null : names.toList()[0] } -def detectMovie(movieFile, strict = true, locale = Locale.ENGLISH, hashLookupService = OpenSubtitles, queryLookupService = TheMovieDB) { +def detectMovie(movieFile, strict = true, queryLookupService = TheMovieDB, hashLookupService = null, locale = Locale.ENGLISH) { def movies = MediaDetection.detectMovie(movieFile, hashLookupService, queryLookupService, locale, strict) return movies == null || movies.isEmpty() ? null : movies.toList()[0] }