From 8d4473d5a35bb66b125b5ea96055dfdfc6189b18 Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Thu, 16 Apr 2020 20:05:59 +0300 Subject: [PATCH] =?UTF-8?q?[FIX]=20IOHelper.move=20=D0=BD=D0=BE=D1=80?= =?UTF-8?q?=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82=20=D0=BD=D0=B0=20linux.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../launchermodules/LauncherModuleLoader.java | 13 ++++++------- .../main/java/pro/gravit/utils/helper/IOHelper.java | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java b/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java index c0d150d0..ec571b65 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java @@ -27,18 +27,17 @@ public class LauncherModuleLoader { public final List launcherModules = new ArrayList<>(); - public Path modules_dir; - private transient LaunchServer server; + public final Path modulesDir; + private final LaunchServer server; public LauncherModuleLoader(LaunchServer server) { - this.server = server; + this.server = server; modulesDir = server.dir.resolve("launcher-modules"); } public void init() { - modules_dir = server.dir.resolve("launcher-modules"); - if (!IOHelper.isDir(modules_dir)) { + if (!IOHelper.isDir(modulesDir)) { try { - Files.createDirectories(modules_dir); + Files.createDirectories(modulesDir); } catch (IOException e) { LogHelper.error(e); } @@ -67,7 +66,7 @@ public void init() { public void syncModules() throws IOException { launcherModules.clear(); - IOHelper.walk(modules_dir, new ModulesVisitor(), false); + IOHelper.walk(modulesDir, new ModulesVisitor(), false); } static class ModuleEntity { diff --git a/LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java index 753b572a..8d7d9455 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java @@ -602,7 +602,7 @@ public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOExce @Override public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { - Files.delete(dir); + if (!this.from.equals(dir)) Files.delete(dir); return FileVisitResult.CONTINUE; } }