Perform clean-up after deleting a backup.

2 files changed, 53 insertions, 20 deletions

diff --git a/src/main/java/com/keuin/kbackupfabric/operation/DeleteOperation.java b/src/main/java/com/keuin/kbackupfabric/operation/DeleteOperation.java
index 7ebff0a..7bfb0b7 100644
--- a/src/main/java/com/keuin/kbackupfabric/operation/DeleteOperation.java
+++ b/src/main/java/com/keuin/kbackupfabric/operation/DeleteOperation.java
@@ -1,5 +1,11 @@
 package com.keuin.kbackupfabric.operation;
 
+import com.keuin.kbackupfabric.backup.BackupFilesystemUtil;
+import com.keuin.kbackupfabric.backup.incremental.ObjectCollection2;
+import com.keuin.kbackupfabric.backup.incremental.ObjectCollectionSerializer;
+import com.keuin.kbackupfabric.backup.incremental.manager.IncrementalBackupStorageManager;
+import com.keuin.kbackupfabric.backup.incremental.serializer.IncBackupInfoSerializer;
+import com.keuin.kbackupfabric.backup.incremental.serializer.SavedIncrementalBackup;
 import com.keuin.kbackupfabric.backup.suggestion.BackupNameSuggestionProvider;
 import com.keuin.kbackupfabric.operation.abstracts.InvokableAsyncBlockingOperation;
 import com.keuin.kbackupfabric.util.PrintUtil;
@@ -9,15 +15,17 @@ import net.minecraft.server.command.ServerCommandSource;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.logging.Logger;
 
 import static com.keuin.kbackupfabric.backup.BackupFilesystemUtil.getBackupSaveDirectory;
+import static com.keuin.kbackupfabric.backup.BackupFilesystemUtil.getIncrementalBackupBaseDirectory;
 import static com.keuin.kbackupfabric.util.PrintUtil.msgErr;
 import static com.keuin.kbackupfabric.util.PrintUtil.msgInfo;
 import static org.apache.commons.io.FileUtils.forceDelete;
 
 public class DeleteOperation extends InvokableAsyncBlockingOperation {
 
-    //private static final Logger LOGGER = LogManager.getLogger();
+    private static final Logger LOGGER = Logger.getLogger(DeleteOperation.class.getName());
     private final String backupFileName;
     private final CommandContext<ServerCommandSource> context;
 
@@ -39,25 +47,50 @@ public class DeleteOperation extends InvokableAsyncBlockingOperation {
     }
 
     private void delete() {
-        MinecraftServer server = context.getSource().getMinecraftServer();
-        PrintUtil.info("Deleting backup file " + this.backupFileName);
-        File backupFile = new File(getBackupSaveDirectory(server), backupFileName);
-        int tryCounter = 0;
-        do {
-            if (tryCounter == 5) {
-                String msg = "Failed to delete file " + backupFileName;
-                PrintUtil.error(msg);
-                msgErr(context, msg);
-                return;
+        try {
+            MinecraftServer server = context.getSource().getMinecraftServer();
+            PrintUtil.info("Deleting backup file " + this.backupFileName);
+            File backupFile = new File(getBackupSaveDirectory(server), backupFileName);
+            SavedIncrementalBackup incrementalBackup = null;
+            if (backupFile.getName().endsWith(".kbi")) {
+                incrementalBackup = IncBackupInfoSerializer.fromFile(backupFile);
             }
-            try {
-                if (!backupFile.delete())
-                    forceDelete(backupFile);
-            } catch (SecurityException | NullPointerException | IOException ignored) {
+
+            // remove .zip or .kbi file
+            PrintUtil.info("Deleting file " + backupFileName + "...");
+            int tryCounter = 0;
+            do {
+                if (tryCounter == 5) {
+                    String msg = "Failed to delete file " + backupFileName;
+                    PrintUtil.error(msg);
+                    msgErr(context, msg);
+                    return;
+                }
+                try {
+                    if (!backupFile.delete())
+                        forceDelete(backupFile);
+                } catch (SecurityException | NullPointerException | IOException ignored) {
+                }
+                ++tryCounter;
+            } while (backupFile.exists());
+
+
+            // If it is an incremental backup, do clean-up
+            if (incrementalBackup != null) {
+                PrintUtil.info("Cleaning up...");
+                IncrementalBackupStorageManager manager =
+                        new IncrementalBackupStorageManager(getIncrementalBackupBaseDirectory(server).toPath());
+                Iterable<ObjectCollection2> backups = ObjectCollectionSerializer
+                        .fromDirectory(BackupFilesystemUtil
+                                .getBackupSaveDirectory(context.getSource().getMinecraftServer()));
+                int deleted = manager.deleteObjectCollection(incrementalBackup.getObjectCollection(), backups);
+                PrintUtil.info("Deleted " + deleted + " unused file(s).");
             }
-            ++tryCounter;
-        } while (backupFile.exists());
-        PrintUtil.info("Successfully deleted backup file " + this.backupFileName);
-        msgInfo(context, "Successfully deleted backup file " + this.backupFileName);
+
+            PrintUtil.info("Successfully deleted backup file " + this.backupFileName);
+            msgInfo(context, "Successfully deleted backup file " + this.backupFileName);
+        } catch (IOException e) {
+            LOGGER.severe("Failed to delete backup: " + e);
+        }
     }
 }
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 ffcc000..5cd58aa 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
@@ -117,7 +117,7 @@ public class ConfiguredIncrementalBackupMethod implements ConfiguredBackupMethod
                     // so we perform a clean here
                     // perform a clean-up
                     Iterable<ObjectCollection2> backups = ObjectCollectionSerializer.fromDirectory(new File(backupIndexFileSaveDirectory));
-                    storageManager.deleteObjectCollection(collection, levelPathFile, backups);
+                    storageManager.deleteObjectCollection(collection, backups);
                 } catch (IOException e) {
                     LOGGER.warning("An exception occurred while cleaning up: " + e);
                 }