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

Improved console output when --action test --conflict override is used (i.e. files can't be deleted in test mode which disables override behavior)

This commit is contained in:
Reinhard Pointner 2017-01-23 04:39:48 +08:00
parent 282f48158e
commit 52bb296ee4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/net/filebot/cli/CmdlineOperations.java
View File

@ -595,14 +595,17 @@ public class CmdlineOperations implements CmdlineInterface {
destination = resolve(source, destination);
}
if (!destination.equals(source) && destination.exists() && renameAction.canRevert()) {
if (!destination.equals(source) && destination.exists()) {
if (conflictAction == ConflictAction.FAIL) {
throw new CmdlineException("File already exists: " + destination);
}
if (conflictAction == ConflictAction.OVERRIDE || (conflictAction == ConflictAction.AUTO && VideoQuality.isBetter(source, destination))) {
if (!destination.delete()) {
log.log(Level.SEVERE, "Failed to override file: " + destination);
// do not delete files in test mode
if (renameAction.canRevert() && destination.delete()) {
log.info(format("[%s] Delete [%s]", conflictAction, destination));
} else {
log.warning(format("[%s] Unable to delete [%s]", conflictAction, destination));
}
} else if (conflictAction == ConflictAction.INDEX) {
destination = nextAvailableIndexedName(destination);