Fix upload thread order

Author: lrmtheboss

DriveBackup/src/main/java/ratismal/drivebackup/UploadThread.java

@@ -40,6 +40,7 @@
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -66,6 +67,7 @@ public class UploadThread implements Runnable {
     private CommandSender initiator;
     private final UploadLogger logger;
     private final FileUtil fileUtil;
+    private Timer totalTimer;
 
     /**
      * The current status of the backup thread
@@ -80,7 +82,9 @@ enum BackupStatus {
          * The backup thread is compressing the files to be backed up.
          */
         COMPRESSING,
-
+        
+        STARTING,
+        PRUNING,
         /**
          * The backup thread is uploading the files
          */
@@ -147,6 +151,7 @@ public void log(String input, String... placeholders) {
             }
         };
         fileUtil = new FileUtil(logger);
+        totalTimer = new Timer();
     }
 
     /**
@@ -181,16 +186,18 @@ public void initiatorError(String input, String... placeholders) {
      */
     @Override
     public void run() {
-        if (!locationsToBePruned.isEmpty()) {
-            locationsToBePruned.clear();
-        }
         Config config = ConfigParser.getConfig();
         if (initiator != null && backupStatus != BackupStatus.NOT_RUNNING) {
             logger.initiatorError(
                 intl("backup-already-running"), 
                 "backup-status", getBackupStatus());
             return;
         }
+        totalTimer.start();
+        backupStatus = BackupStatus.STARTING;
+        if (!locationsToBePruned.isEmpty()) {
+            locationsToBePruned.clear();
+        }
         if (initiator == null) {
             updateNextIntervalBackupTime();
         }
@@ -203,7 +210,7 @@ public void run() {
         }
         boolean errorOccurred = false;
         List<ExternalBackupSource> externalBackupList = Arrays.asList(config.externalBackups.sources);
-        backupList = new ArrayList<BackupListEntry>(Arrays.asList(config.backupList.list));
+        backupList = new ArrayList<>(Arrays.asList(config.backupList.list));
         if (externalBackupList.isEmpty() && backupList.isEmpty()) {
             logger.log(intl("backup-empty-list"));
             return;
@@ -262,7 +269,6 @@ public void run() {
         uploadBackupFiles(uploaders);
         FileUtil.deleteFolder(new File("external-backups"));
         logger.log(intl("backup-upload-complete"));
-        backupStatus = BackupStatus.NOT_RUNNING;
         logger.log(intl("upload-error-check"));
         for (Uploader uploader : uploaders) {
             uploader.close();
@@ -288,7 +294,13 @@ public void run() {
             PlayerListener.setAutoBackupsActive(false);
         }
         lastBackupSuccessful = !errorOccurred;
+        backupStatus = BackupStatus.PRUNING;
         pruneLocalBackups();
+        totalTimer.end();
+        long totalBackupTime = totalTimer.getTime();
+        long totalSeconds = Duration.of(totalBackupTime, ChronoUnit.MILLIS).getSeconds();
+        logger.log(intl("backup-total-time"), "<time>", String.valueOf(totalSeconds));
+        backupStatus = BackupStatus.NOT_RUNNING;
         if (errorOccurred) {
             DriveBackupApi.backupError();
         } else {
@@ -545,6 +557,12 @@ public static String getBackupStatus() {
             case UPLOADING:
                 message = intl("backup-status-uploading");
                 break;
+            case STARTING:
+                message = intl("backup-status-starting");
+                break;
+            case PRUNING:
+                message = intl("backup-status-pruning");
+                break;
             default:
                 return intl("backup-status-not-running");
         }

DriveBackup/src/main/java/ratismal/drivebackup/util/FileUtil.java

@@ -136,30 +136,32 @@ public void pruneLocalBackups(String location, LocalDateTimeFormatter formatter)
         }
         logger.log(intl("local-backup-pruning-start"), "location", location);
         int localKeepCount = ConfigParser.getConfig().backupStorage.localKeepCount;
-        if (localKeepCount != -1) {
+        if (localKeepCount == -1) {
+            logger.info(intl("local-backup-no-limit"));
+        } else {
             try {
                 TreeMap<Long, File> backupList = getLocalBackups(location, formatter);
                 String size = String.valueOf(backupList.size());
                 String keepCount = String.valueOf(localKeepCount);
                 if (backupList.size() > localKeepCount) {
                     logger.info(intl("local-backup-limit-reached"),
-                        "backup-count", size,
-                        "backup-limit", keepCount);
+                                "backup-count", size,
+                                "backup-limit", keepCount);
                 } else {
                     logger.info(intl("local-backup-limit-not-reached"),
-                        "backup-count", size,
-                        "backup-limit", keepCount);
+                                "backup-count", size,
+                                "backup-limit", keepCount);
                     return;
                 }
                 while (backupList.size() > localKeepCount) {
                     File fileToDelete = backupList.descendingMap().lastEntry().getValue();
                     long dateOfFile = backupList.descendingMap().lastKey();
                     if (!fileToDelete.delete()) {
                         logger.log(intl("local-backup-file-failed-to-delete"),
-                            "local-backup-name", fileToDelete.getName());
+                                   "local-backup-name", fileToDelete.getName());
                     } else {
                         logger.info(intl("local-backup-file-deleted"),
-                            "local-backup-name", fileToDelete.getName());
+                                    "local-backup-name", fileToDelete.getName());
                     }
                     backupList.remove(dateOfFile);
                 }
@@ -168,8 +170,6 @@ public void pruneLocalBackups(String location, LocalDateTimeFormatter formatter)
                 logger.log(intl("local-backup-failed-to-delete"));
                 MessageUtil.sendConsoleException(e);
             }
-        } else {
-            logger.info(intl("local-backup-no-limit"));
         }
     }
 

DriveBackup/src/main/java/ratismal/drivebackup/util/Timer.java

@@ -5,8 +5,8 @@
 import java.io.File;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
-import java.util.Locale;
 import java.util.Date;
+import java.util.Locale;
 
 import static ratismal.drivebackup.config.Localization.intl;
 
@@ -64,7 +64,7 @@ public String getUploadTimeMessage(@NotNull File file) {
      * Calculates the time
      * @return Calculated time
      */
-    public double getTime() {
+    public long getTime() {
         return end.getTime() - start.getTime();
     }
 

DriveBackup/src/main/resources/intl.yml

@@ -64,7 +64,10 @@ backup-schedule-time-invalid: "Time invalid, skipping schedule entry <entry>"
 backup-start: "Creating backups, the server may lag for a little while..."
 backup-status-compressing: 'Compressing backup set "<set-name>", set <set-num> of <set-count>'
 backup-status-not-running: "No backups are running"
+backup-status-pruning: "Pruning backups"
+backup-status-starting: "Backup is starting"
 backup-status-uploading: 'Uploading backup set "<set-name>", set <set-num> of <set-count>'
+backup-total-time: "Backup took <time> seconds to compleate"
 backup-upload-complete: "Backup(s) uploaded"
 backup-upload-start: "Uploading backup(s)..."
 backups-interval-scheduled: "Scheduling a backup to run every <delay> minutes"