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

* exit with error code if nothing can be renamed (all modes) 

@see http://www.filebot.net/forums/viewtopic.php?f=4&t=941
This commit is contained in:
Reinhard Pointner 2013-09-13 06:56:30 +00:00
parent 5ba6728022
commit 9551767595
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,14 +369,13 @@ public class CmdlineOperations implements CmdlineInterface {
} else { } else {
CLILogger.fine(format("Looking up movie by query [%s]", query)); CLILogger.fine(format("Looking up movie by query [%s]", query));
List<Movie> results = service.searchMovie(query, locale); List<Movie> results = service.searchMovie(query, locale);
results = applyExpressionFilter(results, filter); List<Movie> validResults = applyExpressionFilter(results, filter);
if (validResults.isEmpty()) {
if (results.isEmpty()) { throw new Exception("Unable to find a valid match: " + results);
throw new Exception(format("Failed to look up movie by query [%s]", query));
} }
// force all mappings // force all mappings
Movie result = (Movie) selectSearchResult(query, results, strict).get(0); Movie result = (Movie) selectSearchResult(query, validResults, strict).get(0);
for (File file : files) { for (File file : files) {
movieByFile.put(file, result); movieByFile.put(file, result);
} }
@ -405,9 +404,11 @@ public class CmdlineOperations implements CmdlineInterface {
if (movie == null) { if (movie == null) {
CLILogger.fine(format("Auto-detect movie from context: [%s]", file)); CLILogger.fine(format("Auto-detect movie from context: [%s]", file));
Collection<Movie> results = detectMovie(file, null, service, locale, strict); Collection<Movie> results = detectMovie(file, null, service, locale, strict);
results = applyExpressionFilter(results, filter); List<Movie> validResults = applyExpressionFilter(results, filter);
try { try {
movie = (Movie) selectSearchResult(query, results, strict).get(0); if (validResults.size() > 0) {
movie = (Movie) selectSearchResult(query, validResults, strict).get(0);
}
} catch (Exception e) { } catch (Exception e) {
CLILogger.log(Level.WARNING, String.format("%s: [%s/%s] %s", e.getClass().getSimpleName(), guessMovieFolder(file) != null ? guessMovieFolder(file).getName() : null, file.getName(), e.getMessage())); CLILogger.log(Level.WARNING, String.format("%s: [%s/%s] %s", e.getClass().getSimpleName(), guessMovieFolder(file) != null ? guessMovieFolder(file).getName() : null, file.getName(), e.getMessage()));
} }
@ -556,6 +557,10 @@ public class CmdlineOperations implements CmdlineInterface {
} }
public List<File> renameAll(Map<File, File> renameMap, RenameAction renameAction, ConflictAction conflictAction) throws Exception { public List<File> renameAll(Map<File, File> renameMap, RenameAction renameAction, ConflictAction conflictAction) throws Exception {
if (renameMap.isEmpty()) {
throw new Exception(format("[%s] Unable to process any files", renameAction));
}
// rename files // rename files
final List<Entry<File, File>> renameLog = new ArrayList<Entry<File, File>>(); final List<Entry<File, File>> renameLog = new ArrayList<Entry<File, File>>();