From a3b22bfe323c2cfa75d0bb83110ec59fb031cf86 Mon Sep 17 00:00:00 2001 From: Keuin Date: Tue, 26 Jan 2021 18:07:11 +0800 Subject: BugFix: fixed malformed success message of incremental backup. --- .gitignore | 2 +- gradle.properties | 2 +- .../keuin/kbackupfabric/backup/incremental/manager/IncCopyResult.java | 2 +- .../operation/backup/feedback/IncrementalBackupFeedback.java | 2 +- .../operation/backup/feedback/PrimitiveBackupFeedback.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0ec7fc0..98ff9ce 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,4 @@ run/ logs/ # testfile -testfile/ConfiguredIncrementalBackupMethodTest \ No newline at end of file +testfile/ConfiguredIncrementalBackupMethodTest diff --git a/gradle.properties b/gradle.properties index 774eb99..de9a8ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.14.4 yarn_mappings=1.14.4+build.18 loader_version=0.11.0 # Mod Properties -mod_version=1.6.1 +mod_version=1.6.2 maven_group=com.keuin.kbackupfabric archives_base_name=kbackup-fabric # Dependencies diff --git a/src/main/java/com/keuin/kbackupfabric/backup/incremental/manager/IncCopyResult.java b/src/main/java/com/keuin/kbackupfabric/backup/incremental/manager/IncCopyResult.java index dbaf9bf..4301adc 100644 --- a/src/main/java/com/keuin/kbackupfabric/backup/incremental/manager/IncCopyResult.java +++ b/src/main/java/com/keuin/kbackupfabric/backup/incremental/manager/IncCopyResult.java @@ -95,7 +95,7 @@ public class IncCopyResult { @Override public String toString() { return String.format( - "Files copied: %d (%s in size, totally %d files). Total file tree size: %s", + "File(s) added: %d (%s in size, totally %d files). Total backup-ed files size: %s", filesCopied, BackupFilesystemUtil.getFriendlyFileSizeString(bytesCopied), totalFiles, diff --git a/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/IncrementalBackupFeedback.java b/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/IncrementalBackupFeedback.java index 1a05c8c..bdd6d88 100644 --- a/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/IncrementalBackupFeedback.java +++ b/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/IncrementalBackupFeedback.java @@ -24,7 +24,7 @@ public class IncrementalBackupFeedback implements BackupFeedback { @Override public String getFeedback() { if (success && copyResult != null) - return String.format("File(s) added: %s.", copyResult); + return copyResult.toString(); else return "Backup failed."; } diff --git a/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/PrimitiveBackupFeedback.java b/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/PrimitiveBackupFeedback.java index e8844a2..094438c 100644 --- a/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/PrimitiveBackupFeedback.java +++ b/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/PrimitiveBackupFeedback.java @@ -23,7 +23,7 @@ public class PrimitiveBackupFeedback implements BackupFeedback { @Override public String getFeedback() { if (success && backupSizeBytes >= 0) - return String.format("File size: %s.", getFriendlyFileSizeString(backupSizeBytes)); + return String.format("Backup file size: %s.", getFriendlyFileSizeString(backupSizeBytes)); else return ""; } -- cgit v1.2.3