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

* fix potential issues with case-change rename (on the same file) on Windows 

getCanonicalPath() will coerce the path into lower/upper case characters as files are named in the filesystem, but getCanonicalPath() is also cached for 30s further complicating things
This commit is contained in:
Reinhard Pointner 2014-09-04 06:27:23 +00:00
parent ffdc8f43f2
commit 859436e727
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/net/filebot/NativeRenameAction.java
View File

@ -4,7 +4,6 @@ import static java.util.Collections.*;
import static net.filebot.util.FileUtilities.*; import static net.filebot.util.FileUtilities.*;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
@ -20,21 +19,21 @@ public enum NativeRenameAction implements RenameAction {
MOVE, COPY; MOVE, COPY;
@Override @Override
public File rename(File src, File dst) throws IOException { public File rename(File src, File dst) {
dst = resolveDestination(src, dst, false).getCanonicalFile(); dst = resolveDestination(src, dst);
rename(singletonMap(src, dst)); rename(singletonMap(src, dst));
return dst; return dst;
} }
public void rename(Map<File, File> map) throws IOException { public void rename(Map<File, File> map) {
String[] src = new String[map.size()]; String[] src = new String[map.size()];
String[] dst = new String[map.size()]; String[] dst = new String[map.size()];
// resolve paths // resolve paths
int i = 0; int i = 0;
for (Entry<File, File> it : map.entrySet()) { for (Entry<File, File> it : map.entrySet()) {
src[i] = it.getKey().getCanonicalPath(); src[i] = it.getKey().getAbsolutePath();
dst[i] = resolveDestination(it.getKey(), it.getValue(), false).getCanonicalPath(); dst[i] = resolveDestination(it.getKey(), it.getValue()).getAbsolutePath();
i++; i++;
} }