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

* don't delete files in test mode even if conflict override is specified

Browse Source
This commit is contained in:
Reinhard Pointner 2015-01-10 21:01:28 +00:00
parent 58b5c74a6c
commit 0a73d7d98d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ import net.filebot.HistorySpooler;
import net.filebot.Language; import net.filebot.Language;
import net.filebot.MediaTypes; import net.filebot.MediaTypes;
import net.filebot.RenameAction; import net.filebot.RenameAction;
import net.filebot.StandardRenameAction;
import net.filebot.archive.Archive; import net.filebot.archive.Archive;
import net.filebot.archive.FileMapper; import net.filebot.archive.FileMapper;
import net.filebot.format.ExpressionFilter; import net.filebot.format.ExpressionFilter;
@ -618,7 +619,7 @@ public class CmdlineOperations implements CmdlineInterface {
destination = new File(source.getParentFile(), destination.getPath()); destination = new File(source.getParentFile(), destination.getPath());
} }
if (!destination.equals(source) && destination.exists()) { if (!destination.equals(source) && destination.exists() && renameAction != StandardRenameAction.TEST) {
if (conflictAction == ConflictAction.FAIL) { if (conflictAction == ConflictAction.FAIL) {
throw new CmdlineException("File already exists: " + destination); throw new CmdlineException("File already exists: " + destination);
} }
@ -656,7 +657,7 @@ public class CmdlineOperations implements CmdlineInterface {
} }
// write metadata into xattr if xattr is enabled // write metadata into xattr if xattr is enabled
if (matches != null && (useExtendedFileAttributes() || useCreationDate())) { if (matches != null && (useExtendedFileAttributes() || useCreationDate()) && renameAction != StandardRenameAction.TEST) {
try { try {
for (Match<File, ?> match : matches) { for (Match<File, ?> match : matches) {
File file = match.getValue(); File file = match.getValue();