From 61c261e76c56744b190134ba68ca5e77d2c170cf Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 21 Nov 2019 11:59:43 +0100 Subject: [PATCH] pvesm list: right align size column Signed-off-by: Thomas Lamprecht --- PVE/CLI/pvesm.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/PVE/CLI/pvesm.pm b/PVE/CLI/pvesm.pm index 63b212a..510faba 100755 --- a/PVE/CLI/pvesm.pm +++ b/PVE/CLI/pvesm.pm @@ -117,30 +117,30 @@ __PACKAGE__->register_method ({ my $print_content = sub { my ($list) = @_; - my $maxlenname = 0; + my ($maxlenname, $maxsize) = (0, 0); foreach my $info (@$list) { - my $volid = $info->{volid}; my $sidlen = length ($volid); $maxlenname = $sidlen if $sidlen > $maxlenname; + $maxsize = $info->{size} if ($info->{size} // 0) > $maxsize; } - printf "%-${maxlenname}s %-6s %-9s %-10s %s\n", "Volid", - "Format", "Type", "Size", "VMID"; + my $sizemaxdigits = length($maxsize); + + my $basefmt = "%-${maxlenname}s %-7s %-9s %${sizemaxdigits}s"; + printf "$basefmt %s\n", "Volid", "Format", "Type", "Size", "VMID"; foreach my $info (@$list) { next if !$info->{vmid}; my $volid = $info->{volid}; - printf "%-${maxlenname}s %-6s %-9s %-10d %d\n", $volid, - $info->{format}, $info->{content}, $info->{size}, $info->{vmid}; + printf "$basefmt %d\n", $volid, $info->{format}, $info->{content}, $info->{size}, $info->{vmid}; } foreach my $info (sort { $a->{format} cmp $b->{format} } @$list) { next if $info->{vmid}; my $volid = $info->{volid}; - printf "%-${maxlenname}s %-6s %-9s %-10d\n", $volid, - $info->{format}, $info->{content}, $info->{size}; + printf "$basefmt\n", $volid, $info->{format}, $info->{content}, $info->{size}; } }; -- 2.39.2