[pbs-devel] [PATCH proxmox-backup 1/3] fix #3331: improve progress for last snapshot in group

[Fabian Grünbichler]

especially for the last group, without this the progress would report:

"percentage done: 100.00% (1 of 2 groups, 1 of 1 group snapshots)"

instead of the more logical

"percentage done: 100.00% (2 of 2 groups)"

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---

Notes:
    note: alternatively, we could only do this special case for the very last
    group, and leave the other groups to display:
    
    "percentage done: 50.00% (1 of 4 groups, 1 of 1 group snapshots)"
    
    which looks a bit weird, but would mean that the format stays consistent over
    the whole log, instead of switching between groups+snapshots and just groups.
    
    see also next patches, which makes it a bit more informative/readable IMHO

 src/backup/store_progress.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/backup/store_progress.rs b/src/backup/store_progress.rs
index 83696f6d..115c14c2 100644
--- a/src/backup/store_progress.rs
+++ b/src/backup/store_progress.rs
@@ -33,6 +33,12 @@ impl StoreProgress {
 
 impl std::fmt::Display for StoreProgress {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let current_group = if self.done_groups < self.total_groups {
+            self.done_groups + 1
+        } else {
+            self.done_groups
+        };
+
         if self.group_snapshots == 0 {
             write!(
                 f,
@@ -49,6 +55,14 @@ impl std::fmt::Display for StoreProgress {
                 self.done_snapshots,
                 self.group_snapshots,
             )
+        } else if self.done_snapshots == self.group_snapshots {
+            write!(
+                f,
+                "{:.2}% ({} of {} groups)",
+                self.percentage() * 100.0,
+                current_group,
+                self.total_groups,
+            )
         } else {
             write!(
                 f,
-- 
2.20.1