moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-11-04 08:25:03 -05:00
Code Issues Releases Wiki Activity

* make problem solution via -non-script option more obvious

Browse Source
This commit is contained in:
Reinhard Pointner 2012-03-06 09:58:40 +00:00
parent 0324798530
commit 03bf30596b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,11 @@ public class CmdlineOperations implements CmdlineInterface {
for (List<File> batch : batchSets) { for (List<File> batch : batchSets) {
// auto-detect series name if not given // auto-detect series name if not given
Collection<String> seriesNames = (query == null) ? detectQuery(batch, locale, strict) : singleton(query); Collection<String> seriesNames = (query == null) ? detectQuery(batch, locale) : singleton(query);
if (strict && seriesNames.size() > 1) {
throw new Exception("Handling multiple shows requires non-strict matching");
}
// fetch episode data // fetch episode data
Set<Episode> episodes = fetchEpisodeSet(db, seriesNames, sortOrder, locale, strict); Set<Episode> episodes = fetchEpisodeSet(db, seriesNames, sortOrder, locale, strict);
@ -510,7 +514,7 @@ public class CmdlineOperations implements CmdlineInterface {
// lookup subtitles via text search, only perform hash lookup in strict mode // lookup subtitles via text search, only perform hash lookup in strict mode
if ((query != null || !strict) && !collector.isComplete()) { if ((query != null || !strict) && !collector.isComplete()) {
// auto-detect search query // auto-detect search query
Collection<String> querySet = (query == null) ? detectQuery(filter(files, VIDEO_FILES), language.toLocale(), false) : singleton(query); Collection<String> querySet = (query == null) ? detectQuery(filter(files, VIDEO_FILES), language.toLocale()) : singleton(query);
for (SubtitleProvider service : WebServices.getSubtitleProviders()) { for (SubtitleProvider service : WebServices.getSubtitleProviders()) {
if (collector.isComplete()) { if (collector.isComplete()) {
@ -665,12 +669,12 @@ public class CmdlineOperations implements CmdlineInterface {
} }
private List<String> detectQuery(Collection<File> mediaFiles, Locale locale, boolean strict) throws Exception { private List<String> detectQuery(Collection<File> mediaFiles, Locale locale) throws Exception {
// detect series name by common word sequence // detect series name by common word sequence
List<String> names = detectSeriesNames(mediaFiles, locale); List<String> names = detectSeriesNames(mediaFiles, locale);
if (names.isEmpty() || (strict && names.size() > 1)) { if (names.isEmpty()) {
throw new Exception("Unable to auto-select query: " + names); throw new Exception("Failed to auto-detect query");
} }
CLILogger.config("Auto-detected query: " + names); CLILogger.config("Auto-detected query: " + names);