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

* enable file override if forced by user

This commit is contained in:
Reinhard Pointner 2013-02-11 04:17:56 +00:00
parent 7b5e0f00f9
commit 8a26af9e6a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/net/sourceforge/filebot/Main.java
View File

@ -119,7 +119,7 @@ public class Main {
if (args.unixfs) { if (args.unixfs) {
System.setProperty("unixfs", "true"); System.setProperty("unixfs", "true");
} }
if (args.disableAnalytics) { if (args.disableAnalytics || args.action.equalsIgnoreCase("test")) {
System.setProperty("application.analytics", "false"); System.setProperty("application.analytics", "false");
} }

5
source/net/sourceforge/tuned/FileUtilities.java
View File

@ -15,6 +15,7 @@ import java.io.StringWriter;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.channels.FileChannel; import java.nio.channels.FileChannel;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
@ -52,7 +53,7 @@ public final class FileUtilities {
} else { } else {
// move file // move file
try { try {
java.nio.file.Files.move(source.toPath(), destination.toPath()); java.nio.file.Files.move(source.toPath(), destination.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
} catch (LinkageError e) { } catch (LinkageError e) {
org.apache.commons.io.FileUtils.moveFile(source, destination); // use "copy and delete" as fallback if standard rename fails org.apache.commons.io.FileUtils.moveFile(source, destination); // use "copy and delete" as fallback if standard rename fails
} }
@ -72,7 +73,7 @@ public final class FileUtilities {
} else { } else {
// copy file // copy file
try { try {
java.nio.file.Files.copy(source.toPath(), destination.toPath()); java.nio.file.Files.copy(source.toPath(), destination.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
} catch (LinkageError e) { } catch (LinkageError e) {
org.apache.commons.io.FileUtils.copyFile(source, destination); org.apache.commons.io.FileUtils.copyFile(source, destination);
} }