From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 6C77B61A8C for ; Mon, 30 Nov 2020 16:28:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 63BD718202 for ; Mon, 30 Nov 2020 16:27:50 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id EEECD181F8 for ; Mon, 30 Nov 2020 16:27:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BA239446BC for ; Mon, 30 Nov 2020 16:27:49 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Mon, 30 Nov 2020 16:27:20 +0100 Message-Id: <20201130152721.666511-4-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201130152721.666511-1-f.gruenbichler@proxmox.com> References: <20201130152721.666511-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.024 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 3/4] progress: add format variants X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2020 15:28:20 -0000 for iterating over a single group, or iterating just on the group level Signed-off-by: Fabian Grünbichler --- src/backup/datastore.rs | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs index 4f49d03f..20617d38 100644 --- a/src/backup/datastore.rs +++ b/src/backup/datastore.rs @@ -775,14 +775,32 @@ impl StoreProgress { impl std::fmt::Display for StoreProgress { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!( - f, - "{:.2}% ({} of {} groups, {} of {} group snapshots)", - self.percentage() * 100.0, - self.done_groups, - self.total_groups, - self.done_snapshots, - self.group_snapshots, - ) + if self.group_snapshots == 0 { + write!( + f, + "{:.2}% ({} of {} groups)", + self.percentage() * 100.0, + self.done_groups, + self.total_groups, + ) + } else if self.total_groups == 1 { + write!( + f, + "{:.2}% ({} of {} snapshots)", + self.percentage() * 100.0, + self.done_snapshots, + self.group_snapshots, + ) + } else { + write!( + f, + "{:.2}% ({} of {} groups, {} of {} group snapshots)", + self.percentage() * 100.0, + self.done_groups, + self.total_groups, + self.done_snapshots, + self.group_snapshots, + ) + } } } -- 2.20.1