From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dietmar@proxmox.com>
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 F1CEC7A432
for <pbs-devel@lists.proxmox.com>; Fri, 7 May 2021 12:15:19 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id E77B729483
for <pbs-devel@lists.proxmox.com>; Fri, 7 May 2021 12:15:19 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(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 64CDC29478
for <pbs-devel@lists.proxmox.com>; Fri, 7 May 2021 12:15:19 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3EB0D4652F
for <pbs-devel@lists.proxmox.com>; Fri, 7 May 2021 12:15:19 +0200 (CEST)
To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com>,
=?UTF-8?Q?Fabian_Gr=c3=bcnbichler?= <f.gruenbichler@proxmox.com>
References: <20210507080310.2430082-1-f.gruenbichler@proxmox.com>
<20210507080310.2430082-3-f.gruenbichler@proxmox.com>
From: Dietmar Maurer <dietmar@proxmox.com>
Message-ID: <a6f5c34c-225f-aa2c-e1f6-8cab708dc2b5@proxmox.com>
Date: Fri, 7 May 2021 12:15:18 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
Thunderbird/78.10.0
MIME-Version: 1.0
In-Reply-To: <20210507080310.2430082-3-f.gruenbichler@proxmox.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Content-Language: en-US
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.231 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
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] applied: [RFC proxmox-backup 3/3] progress: shorter
format
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 07 May 2021 10:15:20 -0000
applied
On 5/7/21 10:03 AM, Fabian Grünbichler wrote:
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
>
> Notes:
> separate patch since it changes format more fundamentally, but can be squashed
> with previous patch if applied.
>
> src/backup/store_progress.rs | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/backup/store_progress.rs b/src/backup/store_progress.rs
> index e355c9bf..754727fc 100644
> --- a/src/backup/store_progress.rs
> +++ b/src/backup/store_progress.rs
> @@ -42,7 +42,7 @@ impl std::fmt::Display for StoreProgress {
> if self.group_snapshots == 0 {
> write!(
> f,
> - "{:.2}% ({} of {} groups)",
> + "{:.2}% ({}/{} groups)",
> self.percentage() * 100.0,
> self.done_groups,
> self.total_groups,
> @@ -50,7 +50,7 @@ impl std::fmt::Display for StoreProgress {
> } else if self.total_groups == 1 {
> write!(
> f,
> - "{:.2}% ({} of {} snapshots)",
> + "{:.2}% ({}/{} snapshots)",
> self.percentage() * 100.0,
> self.done_snapshots,
> self.group_snapshots,
> @@ -58,7 +58,7 @@ impl std::fmt::Display for StoreProgress {
> } else if self.done_snapshots == self.group_snapshots {
> write!(
> f,
> - "{:.2}% ({} of {} groups)",
> + "{:.2}% ({}/{} groups)",
> self.percentage() * 100.0,
> current_group,
> self.total_groups,
> @@ -66,7 +66,7 @@ impl std::fmt::Display for StoreProgress {
> } else {
> write!(
> f,
> - "{:.2}% ({} of {} groups, {} of {} group #{}'s snapshots)",
> + "{:.2}% ({}/{} groups, {}/{} snapshots in group #{})",
> self.percentage() * 100.0,
> self.done_groups,
> self.total_groups,