1
0
mirror of https://github.com/mitb-archive/filebot synced 2025-03-10 06:20:27 -04:00

* make sure to resolve relative paths NativeRenameAction

This commit is contained in:
Reinhard Pointner 2012-07-18 10:48:56 +00:00
parent bc14bf6fc0
commit 306eda5c8a
4 changed files with 25 additions and 16 deletions

View File

@ -2,16 +2,19 @@
-Dapplication.deployment=msi -Dapplication.deployment=msi
-Dapplication.dir="%APPDATA%\FileBot" -Dapplication.dir="%APPDATA%\FileBot"
# memory settings
-Xmx256m
# proxy settings # proxy settings
# -Dhttp.proxyHost=localhost # -Dhttp.proxyHost=localhost
# -Dhttp.proxyPort=8888 # -Dhttp.proxyPort=8888
# do not use native shell for move/copy operations # disable analytics
# -no-analytics
# use native shell for move/copy operations
-DuseNativeShell=true -DuseNativeShell=true
# memory settings
-Xmx256m
# http connection timeouts # http connection timeouts
-Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultConnectTimeout=5000
-Dsun.net.client.defaultReadTimeout=25000 -Dsun.net.client.defaultReadTimeout=25000

View File

@ -6,16 +6,19 @@
-DthreadPool=8 -DthreadPool=8
-Dunixfs=false -Dunixfs=false
# memory settings # proxy settings
-Xms64m # -Dhttp.proxyHost=localhost
-Xmx512m # -Dhttp.proxyPort=8888
# disable analytics
# -no-analytics
# do not use native shell for move/copy operations # do not use native shell for move/copy operations
-DuseNativeShell=false -DuseNativeShell=false
# proxy settings # memory settings
# -Dhttp.proxyHost=localhost -Xms64m
# -Dhttp.proxyPort=8888 -Xmx512m
# http connection timeouts # http connection timeouts
-Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultConnectTimeout=5000

View File

@ -3,16 +3,19 @@
-Dapplication.dir="%EXEDIR%" -Dapplication.dir="%EXEDIR%"
-Duser.home="%EXEDIR%" -Duser.home="%EXEDIR%"
# memory settings
-Xmx256m
# proxy settings # proxy settings
# -Dhttp.proxyHost=localhost # -Dhttp.proxyHost=localhost
# -Dhttp.proxyPort=8888 # -Dhttp.proxyPort=8888
# do not use native shell for move/copy operations # disable analytics
# -no-analytics
# use native shell for move/copy operations
-DuseNativeShell=true -DuseNativeShell=true
# memory settings
-Xmx256m
# http connection timeouts # http connection timeouts
-Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultConnectTimeout=5000
-Dsun.net.client.defaultReadTimeout=25000 -Dsun.net.client.defaultReadTimeout=25000

View File

@ -40,7 +40,7 @@ public enum NativeRenameAction implements RenameAction {
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().getCanonicalPath();
dst[i] = it.getValue().getCanonicalPath(); dst[i] = resolveDestination(it.getKey(), it.getValue()).getCanonicalPath();
i++; i++;
} }
@ -51,7 +51,7 @@ public enum NativeRenameAction implements RenameAction {
op.pFrom = new WString(op.encodePaths(src)); op.pFrom = new WString(op.encodePaths(src));
op.pTo = new WString(op.encodePaths(dst)); op.pTo = new WString(op.encodePaths(dst));
System.out.println("NativeRenameAction.rename()");
Shell32.INSTANCE.SHFileOperation(op); Shell32.INSTANCE.SHFileOperation(op);
if (op.fAnyOperationsAborted) { if (op.fAnyOperationsAborted) {