feat: save full level after make incremental backup

Author: SkyDynamic

common/src/main/java/io/github/skydynamic/quickbackupmulti/DatabaseCache.java

@@ -12,6 +12,10 @@ public class DatabaseCache {
 
     public static void updateStorageInfoCaches() {
         QuickbackupmultiReforged.logger.info("Update storage info caches");
-        storageInfoCaches = QuickbackupmultiReforged.getDatabase().getAllStorageInfo();
+        storageInfoCaches = QuickbackupmultiReforged.getDatabase()
+            .getAllStorageInfo()
+            .stream()
+            .filter(StorageInfo::getUseIncrementalStorage)
+            .toList();
     }
 }

common/src/main/java/io/github/skydynamic/quickbackupmulti/config/ModConfig.java

@@ -81,6 +81,8 @@ public ModConfig copy() {
         newStorage.clientAutoReJoinWorld = this.config.clientAutoReJoinWorld;
         newStorage.storagePath = this.config.storagePath;
         newStorage.cacheDatabase = this.config.cacheDatabase;
+        newStorage.fullBackupInterval = this.config.fullBackupInterval;
+        newStorage.saveFullBackupCount = this.config.saveFullBackupCount;
 
         newStorage.ignoredFiles = new ArrayList<>(this.config.ignoredFiles);
         newStorage.ignoredFolders = new ArrayList<>(this.config.ignoredFolders);
@@ -168,6 +170,14 @@ public boolean isCacheDatabase() {
         return config.cacheDatabase;
     }
 
+    public int getFullBackupInterval() {
+        return config.fullBackupInterval;
+    }
+
+    public int getSaveFullBackupCount() {
+        return config.saveFullBackupCount;
+    }
+
     public ScheduleBackupConfig getScheduleBackupConfig() {
         return config.scheduleBackup;
     }
@@ -209,7 +219,7 @@ public static class ConfigStorage {
 
         private String storagePath = "./QuickBackupMulti";
         private boolean cacheDatabase = false;
-        private int makeFullBackupCountdown = 5;
+        private int fullBackupInterval = 5;
         private int saveFullBackupCount = 5;
 
         private ScheduleBackupConfig scheduleBackup = new ScheduleBackupConfig();
@@ -229,6 +239,8 @@ public String toString() {
                     ", clientAutoReJoinWorld=" + clientAutoReJoinWorld +
                     ", storagePath='" + storagePath + '\'' +
                     ", cacheDatabase=" + cacheDatabase +
+                    ", fullBackupInterval=" + fullBackupInterval +
+                    ", saveFullBackupCount=" + saveFullBackupCount +
                     ", scheduleBackup=" + scheduleBackup +
                     ", prune=" + prune +
                     ", database=" + database +

common/src/main/java/io/github/skydynamic/quickbackupmulti/schedule/runnables/DefaultPruneRunnable.java

@@ -38,7 +38,7 @@ public void run() {
     }
 
     private static void defaultPruneRegularBackup(PruneScheduleConfig config, CommandSourceStack commandSourceStack) {
-        List<StorageInfo> backupList = QuickbackupmultiReforged.getDatabase().getAllStorageInfo();
+        List<StorageInfo> backupList = BackupManager.getBackupsList();
         List<StorageInfo> toDelete = filterBackupWithPbs(config.getRegularBackup(), backupList, config.getTimezoneOverride());
         toDelete.forEach(backup -> BackupManager.deleteBackup(commandSourceStack, backup.getName()));
 

common/src/main/java/io/github/skydynamic/quickbackupmulti/utils/BackupManager.java

@@ -39,7 +39,7 @@ public static Path getBackupPath() {
             try {
                 Files.createDirectories(path);
             } catch (IOException e) {
-                QuickbackupmultiReforged.logger.error("Create backup path error: {}", e.getMessage());
+                logger.error("Create backup path error: {}", e.getMessage());
             }
         }
         return path;
@@ -48,7 +48,11 @@ public static Path getBackupPath() {
     public static List<StorageInfo> getBackupsList() {
         List<StorageInfo> backupList;
         if (!QuickbackupmultiReforged.getModConfig().isCacheDatabase()) {
-            backupList = QuickbackupmultiReforged.getDatabase().getAllStorageInfo();
+            backupList = QuickbackupmultiReforged.getDatabase()
+                .getAllStorageInfo()
+                .stream()
+                .filter(StorageInfo::getUseIncrementalStorage)
+                .toList();
         } else {
             backupList = DatabaseCache.getStorageInfoCaches();
         }
@@ -79,6 +83,48 @@ public static int getBackupIndex(String name) {
         return -1;
     }
 
+    private static void makeFullBackup() {
+        if (QuickbackupmultiReforged.getModConfig().getFullBackupInterval() == -1) {
+            return;
+        }
+
+        if (!getBackupPath().resolve("full").toFile().exists()) {
+            logger.info("Do not have a full backup, make a full backup for future use...");
+            QuickbackupmultiReforged.getManager().fullStorage(
+                "FullBackup-" + (QuickbackupmultiReforged.getModContainer().getLevelId().isEmpty() ? "Server" : QuickbackupmultiReforged.getModContainer().getLevelId()),
+                "Full backup",
+                QuickbackupmultiReforged.getModContainer().getCurrentSavePath().toFile(),
+                fileFilter,
+                folderFilter
+            );
+        } else {
+            List<StorageInfo> storageInfoList = QuickbackupmultiReforged.getDatabase().getAllStorageInfo();
+            List<StorageInfo> incrementalBackups = storageInfoList.stream().filter(StorageInfo::getUseIncrementalStorage).toList();
+            List<StorageInfo> fullBackups = storageInfoList.stream().filter(it -> !it.getUseIncrementalStorage()).toList();
+            if (!incrementalBackups.isEmpty() && incrementalBackups.size() % QuickbackupmultiReforged.getModConfig().getFullBackupInterval() == 0) {
+                if (fullBackups.size() >= QuickbackupmultiReforged.getModConfig().getSaveFullBackupCount()) {
+                    fullBackups.stream().min(Comparator.comparingLong(StorageInfo::getTimestamp))
+                        .ifPresent(oldestFullBackup -> {
+                            try {
+                                logger.info("Delete oldest full backup: {}", oldestFullBackup.getName());
+                                FileUtils.deleteDirectory(getBackupPath().resolve("full").resolve(oldestFullBackup.getName()).toFile());
+                            } catch (IOException e) {
+                                logger.error("delete oldest full backup failed: ", e);
+                            }
+                        });
+                }
+                logger.info("Make a full backup for future use...");
+                QuickbackupmultiReforged.getManager().fullStorage(
+                    "FullBackup-" + (QuickbackupmultiReforged.getModContainer().getLevelId().isEmpty() ? "Server" : QuickbackupmultiReforged.getModContainer().getLevelId()),
+                    "Full backup",
+                    QuickbackupmultiReforged.getModContainer().getCurrentSavePath().toFile(),
+                    fileFilter,
+                    folderFilter
+                );
+            }
+        }
+    }
+
     public static void makeBackup(CommandSourceStack commandSource, String name, String desc) {
         if (QuickbackupmultiReforged.getDatabase().storageExists(name)) {
             commandSource.sendSystemMessage(Component.nullToEmpty(tr("quickbackupmulti.make.fail_exists")));
@@ -113,15 +159,17 @@ public static void makeBackup(CommandSourceStack commandSource, String name, Str
         } catch (Exception e) {
             logger.error("Make Backup Failed", e);
             commandSource.sendSystemMessage(Component.nullToEmpty(tr("quickbackupmulti.make.fail",  e.toString())));
+        } finally {
+            makeFullBackup();
         }
     }
 
     public static void makeTempBackup() {
-        QuickbackupmultiReforged.logger.info("Make a temp backup...");
+        logger.info("Make a temp backup...");
         QuickbackupmultiReforged.getManager().incrementalStorageTemp(
             QuickbackupmultiReforged.getModContainer().getCurrentSavePath().toFile(), fileFilter, folderFilter
         );
-        QuickbackupmultiReforged.logger.info("Make a temp backup success.");
+        logger.info("Make a temp backup success.");
     }
 
     public static boolean deleteBackup(CommandSourceStack commandSource, String name) {
@@ -183,7 +231,7 @@ public static void deleteWorld(String worldName) {
                 database.deleteTableValue(storageInfo.getName(), DatabaseTables.STORAGE_INFO);
             }
         } catch (IOException e) {
-            QuickbackupmultiReforged.logger.error("Delete Failed", e);
+            logger.error("Delete Failed", e);
         } finally {
             database.closeDatabase();
         }

gradle.properties

@@ -15,4 +15,4 @@ fabric_loader_version = 0.16.10
 fabric_api_version = 0.102.0+1.21
 neoforge_version = 21.0.167
 
-incremental_storage_lib_version=1.3.0+build.26030515.35
+incremental_storage_lib_version=1.3.0+build.26030517.05