proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-04-28 12:10:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

format: handle undef, 0, and decimals in render_duration

Browse Source 
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2021-02-08 12:15:08 +01:00 committed by Thomas Lamprecht
parent 57b3385290
commit 4997835b08
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/PVE/Format.pm
View File

@ -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) = @_;

6
test/format_test.pl
View File

@ -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%"],