[pve-devel] [PATCH v2 common 2/6] format: handle undef, 0, and decimals in render_duration

Stefan Reiter s.reiter at proxmox.com
Mon Feb 8 12:15:08 CET 2021


Signed-off-by: Stefan Reiter <s.reiter at proxmox.com>
---

This might be a "breaking" change for some situations, but I believe this should
be more correct in the long run... If this is not wanted, we must do a ceil() or
similar on the value passed in from patch 4/6, otherwise it will not print a
time value for the first iteration.

 src/PVE/Format.pm   | 6 ++++--
 test/format_test.pl | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/PVE/Format.pm b/src/PVE/Format.pm
index 7c3c062..b345129 100644
--- a/src/PVE/Format.pm
+++ b/src/PVE/Format.pm
@@ -3,7 +3,7 @@ package PVE::Format;
 use strict;
 use warnings;
 
-use POSIX qw(strftime);
+use POSIX qw(strftime round);
 use PVE::JSONSchema;
 
 use base 'Exporter';
@@ -33,7 +33,9 @@ sub render_duration {
     my ($duration_in_seconds) = @_;
 
     my $text = '';
-    my $rest = $duration_in_seconds;
+    my $rest = round($duration_in_seconds // 0);
+
+    return "0s" if !$rest;
 
     my $step = sub {
 	my ($unit, $unitlength) = @_;
diff --git a/test/format_test.pl b/test/format_test.pl
index b6688ab..32c00f1 100755
--- a/test/format_test.pl
+++ b/test/format_test.pl
@@ -31,9 +31,11 @@ my $render_data = [
     ["timestamp", 1612776831, undef, "2021-02-08 10:33:51"],
     ["timestamp_gmt", 0, undef, "1970-01-01 00:00:00"],
     ["timestamp_gmt", 1612776831, undef, "2021-02-08 09:33:51"],
-    ["duration", 0, undef, ""],
+    ["duration", undef, undef, "0s"],
+    ["duration", 0.3, undef, "0s"],
+    ["duration", 0, undef, "0s"],
     ["duration", 40, undef, "40s"],
-    ["duration", 60, undef, "1m"],
+    ["duration", 59.64432, undef, "1m"],
     ["duration", 110, undef, "1m 50s"],
     ["duration", 7*24*3829*2, undef, "2w 21h 22m 24s"],
     ["fraction_as_percentage", 0.412, undef, "41.20%"],
-- 
2.20.1





More information about the pve-devel mailing list