1.4.2: BugFix: The plugin makes a blank backup if the world (is created in client-side and) is not named as the same with the folder name (by default it is `world`, the backup will fail silently if the world name is not equal to the folder name).

3 files changed, 79 insertions, 60 deletions

diff --git a/gradle.properties b/gradle.properties
index ccc429a..ef7c112 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version=1.14.4
 yarn_mappings=1.14.4+build.18
 loader_version=0.11.0
 # Mod Properties
-mod_version=1.4.1
+mod_version=1.4.2
 maven_group=com.keuin.kbackupfabric
 archives_base_name=kbackup-fabric
 # Dependencies
diff --git a/src/main/java/com/keuin/kbackupfabric/KBCommands.java b/src/main/java/com/keuin/kbackupfabric/KBCommands.java
index 98f6369..1b52b6b 100644
--- a/src/main/java/com/keuin/kbackupfabric/KBCommands.java
+++ b/src/main/java/com/keuin/kbackupfabric/KBCommands.java
@@ -19,6 +19,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.ServerCommandSource;
 
 import java.io.File;
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -207,79 +208,89 @@ public final class KBCommands {
      * @return stat code.
      */
     public static int restore(CommandContext<ServerCommandSource> context) {
-        //KBMain.restore("name")
-        MinecraftServer server = context.getSource().getMinecraftServer();
-        String backupFileName = parseBackupFileName(context, StringArgumentType.getString(context, "backupName"));
-        backupFileName = parseBackupFileName(context, backupFileName);
+        try {
+            //KBMain.restore("name")
+            MinecraftServer server = context.getSource().getMinecraftServer();
+            String backupFileName = parseBackupFileName(context, StringArgumentType.getString(context, "backupName"));
+            backupFileName = parseBackupFileName(context, backupFileName);
 
-        if (backupFileName == null)
-            return list(context); // Show the list and return
+            if (backupFileName == null)
+                return list(context); // Show the list and return
 
-        // Validate backupName
-        if (!isBackupFileExists(backupFileName, server)) {
-            // Invalid backupName
-            msgErr(context, "Invalid backup name! Please check your input. The list index number is also valid.", false);
-            return FAILED;
-        }
+            // Validate backupName
+            if (!isBackupFileExists(backupFileName, server)) {
+                // Invalid backupName
+                msgErr(context, "Invalid backup name! Please check your input. The list index number is also valid.", false);
+                return FAILED;
+            }
 
-        // Detect backup type
+            // Detect backup type
 
 
-        // Update pending task
-        //pendingOperation = AbstractConfirmableOperation.createRestoreOperation(context, backupName);
+            // Update pending task
+            //pendingOperation = AbstractConfirmableOperation.createRestoreOperation(context, backupName);
 //        File backupFile = new File(getBackupSaveDirectory(server), getBackupFileName(backupName));
-        // TODO: improve this
-        ConfiguredBackupMethod method = backupFileName.endsWith(".zip") ?
-                new ConfiguredPrimitiveBackupMethod(
-                        backupFileName, getLevelPath(server), getBackupSaveDirectory(server).getAbsolutePath()
-                ) : new ConfiguredIncrementalBackupMethod(
-                backupFileName, getLevelPath(server),
-                getBackupSaveDirectory(server).getAbsolutePath(),
-                getIncrementalBackupBaseDirectory(server).getAbsolutePath()
-        );
-        // String backupSavePath, String levelPath, String backupFileName
+            // TODO: improve this
+            ConfiguredBackupMethod method = backupFileName.endsWith(".zip") ?
+                    new ConfiguredPrimitiveBackupMethod(
+                            backupFileName, getLevelPath(server), getBackupSaveDirectory(server).getAbsolutePath()
+                    ) : new ConfiguredIncrementalBackupMethod(
+                    backupFileName, getLevelPath(server),
+                    getBackupSaveDirectory(server).getAbsolutePath(),
+                    getIncrementalBackupBaseDirectory(server).getAbsolutePath()
+            );
+            // String backupSavePath, String levelPath, String backupFileName
 //        getBackupSaveDirectory(server).getAbsolutePath(), getLevelPath(server), backupFileName
-        pendingOperation = new RestoreOperation(context, method);
+            pendingOperation = new RestoreOperation(context, method);
 
-        msgWarn(context, String.format("RESET WARNING: You will LOSE YOUR CURRENT WORLD PERMANENTLY! The worlds will be replaced with backup %s . Use /kb confirm to start or /kb cancel to abort.", backupFileName), true);
-        return SUCCESS;
+            msgWarn(context, String.format("RESET WARNING: You will LOSE YOUR CURRENT WORLD PERMANENTLY! The worlds will be replaced with backup %s . Use /kb confirm to start or /kb cancel to abort.", backupFileName), true);
+            return SUCCESS;
+        } catch (IOException e) {
+            msgErr(context, String.format("An I/O exception occurred while making backup: %s", e));
+        }
+        return FAILED;
     }
 
     private static int doBackup(CommandContext<ServerCommandSource> context, String customBackupName, boolean incremental) {
-        // Real backup name (compatible with legacy backup): date_name, such as 2020-04-23_21-03-00_test
-        //KBMain.backup("name")
+        try {
+            // Real backup name (compatible with legacy backup): date_name, such as 2020-04-23_21-03-00_test
+            //KBMain.backup("name")
 //        String backupName = BackupNameTimeFormatter.getTimeString() + "_" + customBackupName;
 
-        // Validate file name
-        final char[] ILLEGAL_CHARACTERS = {'/', '\n', '\r', '\t', '\0', '\f', '`', '?', '*', '\\', '<', '>', '|', '\"', ':'};
-        for (char c : ILLEGAL_CHARACTERS) {
-            if (customBackupName.contains(String.valueOf(c))) {
-                msgErr(context, String.format("Name cannot contain special character \"%c\".", c));
-                return FAILED;
+            // Validate file name
+            final char[] ILLEGAL_CHARACTERS = {'/', '\n', '\r', '\t', '\0', '\f', '`', '?', '*', '\\', '<', '>', '|', '\"', ':'};
+            for (char c : ILLEGAL_CHARACTERS) {
+                if (customBackupName.contains(String.valueOf(c))) {
+                    msgErr(context, String.format("Name cannot contain special character \"%c\".", c));
+                    return FAILED;
+                }
             }
-        }
 
-        PrintUtil.info("Start backup...");
+            PrintUtil.info("Start backup...");
 
-        // configure backup method
-        MinecraftServer server = context.getSource().getMinecraftServer();
-        ConfiguredBackupMethod method = !incremental ? new ConfiguredPrimitiveBackupMethod(
-                new PrimitiveBackupFileNameEncoder().encode(customBackupName, LocalDateTime.now()),
-                getLevelPath(server),
-                getBackupSaveDirectory(server).getAbsolutePath()
-        ) : new ConfiguredIncrementalBackupMethod(
-                new IncrementalBackupFileNameEncoder().encode(customBackupName, LocalDateTime.now()),
-                getLevelPath(server),
-                getBackupSaveDirectory(server).getAbsolutePath(),
-                getIncrementalBackupBaseDirectory(server).getAbsolutePath()
-        );
-
-        // dispatch to operation worker
-        BackupOperation operation = new BackupOperation(context, method);
-        if (operation.invoke()) {
-            return SUCCESS;
-        } else if (operation.isBlocked()) {
-            msgWarn(context, "Another task is running, cannot issue new backup at once.");
+            // configure backup method
+            MinecraftServer server = context.getSource().getMinecraftServer();
+            ConfiguredBackupMethod method = !incremental ? new ConfiguredPrimitiveBackupMethod(
+                    new PrimitiveBackupFileNameEncoder().encode(customBackupName, LocalDateTime.now()),
+                    getLevelPath(server),
+                    getBackupSaveDirectory(server).getAbsolutePath()
+            ) : new ConfiguredIncrementalBackupMethod(
+                    new IncrementalBackupFileNameEncoder().encode(customBackupName, LocalDateTime.now()),
+                    getLevelPath(server),
+                    getBackupSaveDirectory(server).getAbsolutePath(),
+                    getIncrementalBackupBaseDirectory(server).getAbsolutePath()
+            );
+
+            // dispatch to operation worker
+            BackupOperation operation = new BackupOperation(context, method);
+            if (operation.invoke()) {
+                return SUCCESS;
+            } else if (operation.isBlocked()) {
+                msgWarn(context, "Another task is running, cannot issue new backup at once.");
+                return FAILED;
+            }
+        } catch (IOException e) {
+            msgErr(context, String.format("An I/O exception occurred while making backup: %s", e));
         }
         return FAILED;
     }
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/BackupFilesystemUtil.java b/src/main/java/com/keuin/kbackupfabric/util/backup/BackupFilesystemUtil.java
index 7106ad2..28ede70 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/BackupFilesystemUtil.java
+++ b/src/main/java/com/keuin/kbackupfabric/util/backup/BackupFilesystemUtil.java
@@ -2,10 +2,13 @@ package com.keuin.kbackupfabric.util.backup;
 
 import com.keuin.kbackupfabric.util.ReflectionUtils;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.dedicated.MinecraftDedicatedServer;
 import net.minecraft.server.world.ThreadedAnvilChunkStorage;
 import net.minecraft.world.World;
 
 import java.io.File;
+import java.io.IOException;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -47,8 +50,13 @@ public final class BackupFilesystemUtil {
         return new File(server.getRunDirectory(), INCREMENTAL_BASE_DIRECTORY_NAME);
     }
 
-    public static String getLevelPath(MinecraftServer server) {
-        return (new File(server.getRunDirectory(), server.getLevelName())).getAbsolutePath();
+    public static String getLevelPath(MinecraftServer server) throws IOException {
+        if (!(server instanceof MinecraftDedicatedServer))
+            throw new IllegalStateException("This plugin is server-side only.");
+        String path = (new File(server.getRunDirectory().getCanonicalPath(), ((MinecraftDedicatedServer) server).getLevelName())).getAbsolutePath();
+        Logger.getLogger("getLevelPath").info(String.format("Level path: %s", path));
+        assert (new File(path)).exists();
+        return path;
     }
 
     public static String getWorldDirectoryName(World world) throws NoSuchFieldException, IllegalAccessException {