From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 1/3] fix #3331: improve progress for last snapshot in group
Date: Fri, 7 May 2021 10:03:08 +0200 [thread overview]
Message-ID: <20210507080310.2430082-1-f.gruenbichler@proxmox.com> (raw)
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@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
next reply other threads:[~2021-05-07 8:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-07 8:03 Fabian Grünbichler [this message]
2021-05-07 8:03 ` [pbs-devel] [RFC proxmox-backup 2/3] progress: add current group to output Fabian Grünbichler
2021-05-07 10:15 ` [pbs-devel] applied: " Dietmar Maurer
2021-05-07 8:03 ` [pbs-devel] [RFC proxmox-backup 3/3] progress: shorter format Fabian Grünbichler
2021-05-07 10:15 ` [pbs-devel] applied: " Dietmar Maurer
2021-05-07 9:29 ` [pbs-devel] applied: [PATCH proxmox-backup 1/3] fix #3331: improve progress for last snapshot in group Dietmar Maurer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210507080310.2430082-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox