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 D1B026B268 for ; Tue, 16 Mar 2021 12:56:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C126B2D854 for ; Tue, 16 Mar 2021 12:56:25 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DDA972D843 for ; Tue, 16 Mar 2021 12:56:24 +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 A87394590F for ; Tue, 16 Mar 2021 12:56:24 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 16 Mar 2021 12:56:21 +0100 Message-Id: <20210316115623.9368-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.187 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [time.rs] Subject: [pbs-devel] [PATCH proxmox-backup 1/3] tools/systemd/time: implement some Traits for TimeSpan 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: Tue, 16 Mar 2021 11:56:55 -0000 namely * From (to convert easily from duration to timespan) * Display (for better formatting) Signed-off-by: Dominik Csapak --- if wanted, we can optimize the display trait a bit further, e.g. only showing the biggest two units instead src/tools/systemd/time.rs | 84 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/src/tools/systemd/time.rs b/src/tools/systemd/time.rs index 7cc42415..75fb0ea2 100644 --- a/src/tools/systemd/time.rs +++ b/src/tools/systemd/time.rs @@ -141,6 +141,90 @@ impl From for f64 { } } +impl From for TimeSpan { + fn from(duration: std::time::Duration) -> Self { + let mut duration = duration.as_nanos(); + let nsec = (duration % 1000) as u64; + duration /= 1000; + let usec = (duration % 1000) as u64; + duration /= 1000; + let msec = (duration % 1000) as u64; + duration /= 1000; + let seconds = (duration % 60) as u64; + duration /= 60; + let minutes = (duration % 60) as u64; + duration /= 60; + let hours = (duration % 24) as u64; + duration /= 24; + let years = (duration as f64 / 365.25) as u64; + let ydays = (duration as f64 % 365.25) as u64; + let months = (ydays as f64 / 30.44) as u64; + let mdays = (ydays as f64 % 30.44) as u64; + let weeks = mdays / 7; + let days = mdays % 7; + Self { + nsec, + msec, + usec, + seconds, + minutes, + hours, + days, + weeks, + months, + years, + } + } +} + +impl std::fmt::Display for TimeSpan { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> { + let mut single = true; + if self.years > 0 { + write!(f, "{}y", self.years)?; + single = false; + } + let write_space = |single: bool, f: &mut std::fmt::Formatter| -> Result { + if !single { + write!(f, " ")?; + } + Ok(false) + }; + if self.months > 0 { + single = write_space(single, f)?; + write!(f, "{}m", self.months)?; + } + if self.weeks > 0 { + single = write_space(single, f)?; + write!(f, "{}w", self.weeks)?; + } + if self.days > 0 { + single = write_space(single, f)?; + write!(f, "{}d", self.days)?; + } + if self.hours > 0 { + single = write_space(single, f)?; + write!(f, "{}h", self.hours)?; + } + if self.minutes > 0 { + single = write_space(single, f)?; + write!(f, "{}min", self.minutes)?; + } + let seconds = self.seconds as f64 + (self.msec as f64 / 1000.0); + if seconds >= 0.1 { + write_space(single, f)?; + if seconds >= 1.0 || !single { + write!(f, "{:.0}s", seconds)?; + } else { + write!(f, "{:.1}s", seconds)?; + } + } else if single { + write_space(single, f)?; + write!(f, "<0.1s")?; + } + Ok(()) + } +} pub fn verify_time_span(i: &str) -> Result<(), Error> { parse_time_span(i)?; -- 2.20.1