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

* improved error handling

Browse Source
This commit is contained in:
Reinhard Pointner 2013-10-30 05:56:12 +00:00
parent ea84f477b1
commit 3457def998
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,16 +159,29 @@ public class CmdlineOperations implements CmdlineInterface {
} }
for (List<File> batch : batchSets) { for (List<File> batch : batchSets) {
Collection<String> seriesNames;
// auto-detect series name if not given // auto-detect series name if not given
Collection<String> seriesNames = (query == null) ? detectSeriesQuery(batch, locale) : asList(query.split("[|]")); if (query == null) {
// detect series name by common word sequence
seriesNames = detectSeriesNames(batch, locale);
CLILogger.config("Auto-detected query: " + seriesNames);
} else {
// use --q option
seriesNames = asList(query.split("[|]"));
}
if (strict && seriesNames.size() > 1) { if (strict && seriesNames.size() > 1) {
throw new Exception("Handling multiple shows requires non-strict matching"); throw new Exception("Handling multiple shows requires non-strict matching");
} }
if (seriesNames.size() == 0) {
CLILogger.warning("Failed to detect query for files: " + batch);
continue;
}
// fetch episode data // fetch episode data
Collection<Episode> episodes = fetchEpisodeSet(db, seriesNames, sortOrder, locale, strict); Collection<Episode> episodes = fetchEpisodeSet(db, seriesNames, sortOrder, locale, strict);
if (episodes.size() == 0) { if (episodes.size() == 0) {
CLILogger.warning("Failed to fetch episode data: " + seriesNames); CLILogger.warning("Failed to fetch episode data: " + seriesNames);
continue; continue;
@ -821,18 +834,6 @@ public class CmdlineOperations implements CmdlineInterface {
return emptyMap(); return emptyMap();
} }
private List<String> detectSeriesQuery(Collection<File> mediaFiles, Locale locale) throws Exception {
// detect series name by common word sequence
List<String> names = detectSeriesNames(mediaFiles, locale);
if (names.isEmpty()) {
throw new Exception("Failed to auto-detect query");
}
CLILogger.config("Auto-detected query: " + names);
return names;
}
private <T> List<T> applyExpressionFilter(Collection<T> input, ExpressionFilter filter) throws Exception { private <T> List<T> applyExpressionFilter(Collection<T> input, ExpressionFilter filter) throws Exception {
if (filter == null) { if (filter == null) {
return new ArrayList<T>(input); return new ArrayList<T>(input);