v1.8.0

Author: rhld16

DriveBackup/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ratismal</groupId>
     <artifactId>DriveBackupV2</artifactId>
-    <version>1.7.0</version>
+    <version>1.8.0</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!--suppress UnresolvedMavenProperty -->

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

@@ -231,17 +231,18 @@ public void run() {
         backupBackingUp = 0;
         ServerUtil.setAutoSave(false);
         for (BackupListEntry set : backupList) {
-            for(Path folder : set.location.getPaths()) {
+            backupBackingUp++;
+            for (Path folder : set.location.getPaths()) {
                 if (set.create) {
                     makeBackupFile(folder.toString(), set.formatter, Arrays.asList(set.blacklist));
                 }
             }
-            backupBackingUp++;
         }
         ServerUtil.setAutoSave(true);
         logger.log(intl("backup-local-complete"));
         logger.log(intl("backup-upload-start"));
         backupStatus = BackupStatus.UPLOADING;
+        backupBackingUp = 0;
         uploaders = new ArrayList<>(5);
         if (config.backupMethods.googleDrive.enabled) {
             uploaders.add(new GoogleDriveUploader(logger));
@@ -377,6 +378,7 @@ private void makeBackupFile(String location, LocalDateTimeFormatter formatter, L
 
     private void uploadBackupFiles(List<Uploader> uploaders) {
         for (BackupListEntry set : backupList) {
+            backupBackingUp++;
             for(Path folder : set.location.getPaths()) {
                 uploadFile(folder.toString(), set.formatter, uploaders);
             }
@@ -570,10 +572,10 @@ public static String getBackupStatus() {
                 return intl("backup-status-not-running");
         }
         BackupListEntry[] backupList = config.backupList.list;
-        String backupSetName = backupList[backupBackingUp].location.toString();
+        String backupSetName = backupList[backupBackingUp - 1].location.toString();
         return message
             .replace("<set-name>", backupSetName)
-            .replace("<set-num>", String.valueOf(backupBackingUp + 1))
+            .replace("<set-num>", String.valueOf(backupBackingUp))
             .replace("<set-count>", String.valueOf(backupList.length));
     }