Fix minor bug in ZipUtil. Do some clean if backup is failed. Small code refactor.

2 files changed, 60 insertions, 21 deletions

diff --git a/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java b/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java
index 60b825e..baa6580 100644
--- a/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java
+++ b/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java
@@ -14,6 +14,7 @@ import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.logging.Logger;
 
 public class ConfiguredIncrementalBackupMethod implements ConfiguredBackupMethod {
 
@@ -22,6 +23,8 @@ public class ConfiguredIncrementalBackupMethod implements ConfiguredBackupMethod
     private final String backupIndexFileSaveDirectory;
     private final String backupBaseDirectory;
 
+    private static final Logger LOGGER = Logger.getLogger(ConfiguredIncrementalBackupMethod.class.getName());
+
     public ConfiguredIncrementalBackupMethod(String backupIndexFileName, String levelPath, String backupIndexFileSaveDirectory, String backupBaseDirectory) {
         this.backupIndexFileName = backupIndexFileName;
         this.levelPath = levelPath;
@@ -30,26 +33,45 @@ public class ConfiguredIncrementalBackupMethod implements ConfiguredBackupMethod
     }
 
     @Override
-    public IncrementalBackupFeedback backup() throws IOException {
-        File levelPathFile = new File(levelPath);
+    public IncrementalBackupFeedback backup() {
+        IncrementalBackupFeedback feedback;
+        try {
+            File levelPathFile = new File(levelPath);
+
+            // construct incremental backup index
+            PrintUtil.info("Hashing files...");
+            ObjectCollection collection = new ObjectCollectionFactory<>(Sha256Identifier.getFactory())
+                    .fromDirectory(levelPathFile, new HashSet<>(Arrays.asList("session.lock", "kbackup_metadata")));
+
+            // update storage
+            PrintUtil.info("Copying files...");
+            IncrementalBackupStorageManager storageManager = new IncrementalBackupStorageManager(Paths.get(backupBaseDirectory));
+            int filesAdded = storageManager.addObjectCollection(collection, levelPathFile);
+
+            // save index file
+            PrintUtil.info("Saving index file...");
+            ObjectCollectionSerializer.toFile(collection, new File(backupIndexFileSaveDirectory, backupIndexFileName));
+
+            // return result
+            PrintUtil.info("Incremental backup finished.");
+            feedback = new IncrementalBackupFeedback(filesAdded >= 0, filesAdded);
+        } catch (IOException e) {
+            feedback = new IncrementalBackupFeedback(false, 0);
+        }
 
-        // construct incremental backup index
-        PrintUtil.info("Hashing files...");
-        ObjectCollection collection = new ObjectCollectionFactory<>(Sha256Identifier.getFactory())
-                .fromDirectory(levelPathFile, new HashSet<>(Arrays.asList("session.lock", "kbackup_metadata")));
+        if (!feedback.isSuccess()) {
+            // do clean-up if failed
+            File backupIndexFile = new File(backupIndexFileSaveDirectory, backupIndexFileName);
+            if (backupIndexFile.exists()) {
+                if (!backupIndexFile.delete()) {
+                    LOGGER.warning("Failed to clean up: cannot delete file " + backupIndexFile.getName());
+                }
+            }
 
-        // update storage
-        PrintUtil.info("Copying files...");
-        IncrementalBackupStorageManager storageManager = new IncrementalBackupStorageManager(Paths.get(backupBaseDirectory));
-        int filesAdded = storageManager.addObjectCollection(collection, levelPathFile);
-
-        // save index file
-        PrintUtil.info("Saving index file...");
-        ObjectCollectionSerializer.toFile(collection, new File(backupIndexFileSaveDirectory, backupIndexFileName));
+            //TODO: do more deep clean for object files
+        }
 
-        // return result
-        PrintUtil.info("Incremental backup finished.");
-        return new IncrementalBackupFeedback(filesAdded >= 0, filesAdded);
+        return feedback;
     }
 
     @Override
diff --git a/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredPrimitiveBackupMethod.java b/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredPrimitiveBackupMethod.java
index 87a3043..86a60df 100644
--- a/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredPrimitiveBackupMethod.java
+++ b/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredPrimitiveBackupMethod.java
@@ -14,6 +14,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
+import java.util.logging.Logger;
 
 public class ConfiguredPrimitiveBackupMethod implements ConfiguredBackupMethod {
 
@@ -21,6 +22,8 @@ public class ConfiguredPrimitiveBackupMethod implements ConfiguredBackupMethod {
     private final String levelPath;
     private final String backupSavePath;
 
+    private final Logger LOGGER = Logger.getLogger(ConfiguredPrimitiveBackupMethod.class.getName());
+
     public ConfiguredPrimitiveBackupMethod(String backupFileName, String levelPath, String backupSavePath) {
         this.backupFileName = backupFileName;
         this.levelPath = levelPath;
@@ -34,20 +37,34 @@ public class ConfiguredPrimitiveBackupMethod implements ConfiguredBackupMethod {
     }
 
     @Override
-    public PrimitiveBackupFeedback backup() throws IOException {
+    public PrimitiveBackupFeedback backup() {
+
+        PrimitiveBackupFeedback feedback;
+
         try {
             String customBackupName = new PrimitiveBackupFileNameEncoder().decode(backupFileName).customName;
             BackupMetadata backupMetadata = new BackupMetadata(System.currentTimeMillis(), customBackupName);
             PrintUtil.info(String.format("zip(srcPath=%s, destPath=%s)", levelPath, backupSavePath));
             PrintUtil.info("Compressing level ...");
             ZipUtil.makeBackupZip(levelPath, backupSavePath, backupFileName, backupMetadata);
+            feedback = new PrimitiveBackupFeedback(true, FilesystemUtil.getFileSizeBytes(backupSavePath, backupFileName));
         } catch (ZipUtilException exception) {
             PrintUtil.info("Infinite recursive of directory tree detected, backup was aborted.");
-            return new PrimitiveBackupFeedback(false, 0);
+            feedback = new PrimitiveBackupFeedback(false, 0);
+        } catch (IOException e) {
+            feedback = new PrimitiveBackupFeedback(false, 0);
         }
 
-        // Get backup file size and return
-        return new PrimitiveBackupFeedback(true, FilesystemUtil.getFileSizeBytes(backupSavePath, backupFileName));
+        if (!feedback.isSuccess()) {
+            // do clean-up if failed
+            File backupFile = new File(backupSavePath, backupFileName);
+            if (backupFile.exists()) {
+                if (!backupFile.delete()) {
+                    LOGGER.warning("Failed to clean up: cannot delete file " + backupFile.getName());
+                }
+            }
+        }
+        return feedback;
     }
 
     @Override