Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-18 22:13:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] DirBridge.move

Browse source
This commit is contained in:
Zaxar163 2020-04-17 17:45:48 +03:00
parent 8d4473d5a3
commit 0871b11067
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Launcher/src/main/java/pro/gravit/launcher/client/DirBridge.java
View file

@ -52,9 +52,10 @@ public static void move(Path newDir) throws IOException {
LogHelper.dev(LogHelper.toString(new Throwable("Check stack of call DirBridge with null path..."))); LogHelper.dev(LogHelper.toString(new Throwable("Check stack of call DirBridge with null path...")));
return; return;
} }
Path oldUpdates = dirUpdates;
dirUpdates = newDir; dirUpdates = newDir;
LogHelper.dev(newDir.toString()); LogHelper.dev(newDir.toString());
IOHelper.move(dirUpdates, newDir); IOHelper.move(oldUpdates, dirUpdates);
} }
public static Path getAppDataDir() throws IOException { public static Path getAppDataDir() throws IOException {

6
LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java
View file

@ -584,14 +584,13 @@ private MoveFileVisitor(Path from, Path to) {
} }
@Override @Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
return FileVisitResult.CONTINUE; return FileVisitResult.CONTINUE;
} }
@Override @Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
IOHelper.copy(file, to.resolve(from.relativize(file))); Files.move(file, to.resolve(from.relativize(file)), COPY_OPTIONS);
Files.delete(file);
return FileVisitResult.CONTINUE; return FileVisitResult.CONTINUE;
} }
@ -602,6 +601,7 @@ public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOExce
@Override @Override
public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
if (exc != null) throw exc;
if (!this.from.equals(dir)) Files.delete(dir); if (!this.from.equals(dir)) Files.delete(dir);
return FileVisitResult.CONTINUE; return FileVisitResult.CONTINUE;
} }