proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-16 01:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

print_text_table: align numbers to the right side

Browse Source 
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
Dietmar Maurer 2018-07-27 14:00:28 +02:00 committed by Thomas Lamprecht
parent b9474c9682
commit 2ec79c0f95
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/PVE/CLIFormatter.pm
View File

@ -226,6 +226,8 @@ sub print_text_table {
for (my $i = 0; $i < $column_count; $i++) { for (my $i = 0; $i < $column_count; $i++) {
my $prop = $props_to_print->[$i]; my $prop = $props_to_print->[$i];
my $propinfo = $returnprops->{$prop} // {}; my $propinfo = $returnprops->{$prop} // {};
my $type = $propinfo->{type} // 'string';
my $alignstr = ($type eq 'integer' || $type eq 'number') ? '' : '-';
my $title = $propinfo->{title} // $prop; my $title = $propinfo->{title} // $prop;
my $cutoff = $propinfo->{print_width} // $propinfo->{maxLength}; my $cutoff = $propinfo->{print_width} // $propinfo->{maxLength};
@ -248,48 +250,48 @@ sub print_text_table {
if ($border) { if ($border) {
if ($i == 0 && ($column_count == 1)) { if ($i == 0 && ($column_count == 1)) {
if ($utf8) { if ($utf8) {
$formatstring .= "│ %-${cutoff}s │"; $formatstring .= "│ %$alignstr${cutoff}s │";
$borderstring_t .= "┌─" . ('─' x $cutoff) . "─┐"; $borderstring_t .= "┌─" . ('─' x $cutoff) . "─┐";
$borderstring_m .= "├─" . ('─' x $cutoff) . "─┤"; $borderstring_m .= "├─" . ('─' x $cutoff) . "─┤";
$borderstring_b .= "└─" . ('─' x $cutoff) . "─┘"; $borderstring_b .= "└─" . ('─' x $cutoff) . "─┘";
} else { } else {
$formatstring .= "| %-${cutoff}s |"; $formatstring .= "| %$alignstr${cutoff}s |";
$borderstring_m .= "+-" . ('-' x $cutoff) . "-+"; $borderstring_m .= "+-" . ('-' x $cutoff) . "-+";
} }
} elsif ($i == 0) { } elsif ($i == 0) {
if ($utf8) { if ($utf8) {
$formatstring .= "│ %-${cutoff}s "; $formatstring .= "│ %$alignstr${cutoff}s ";
$borderstring_t .= "┌─" . ('─' x $cutoff) . '─'; $borderstring_t .= "┌─" . ('─' x $cutoff) . '─';
$borderstring_m .= "├─" . ('─' x $cutoff) . '─'; $borderstring_m .= "├─" . ('─' x $cutoff) . '─';
$borderstring_b .= "└─" . ('─' x $cutoff) . '─'; $borderstring_b .= "└─" . ('─' x $cutoff) . '─';
} else { } else {
$formatstring .= "| %-${cutoff}s "; $formatstring .= "| %$alignstr${cutoff}s ";
$borderstring_m .= "+-" . ('-' x $cutoff) . '-'; $borderstring_m .= "+-" . ('-' x $cutoff) . '-';
} }
} elsif ($i == ($column_count - 1)) { } elsif ($i == ($column_count - 1)) {
if ($utf8) { if ($utf8) {
$formatstring .= "│ %-${cutoff}s │"; $formatstring .= "│ %$alignstr${cutoff}s │";
$borderstring_t .= "┬─" . ('─' x $cutoff) . "─┐"; $borderstring_t .= "┬─" . ('─' x $cutoff) . "─┐";
$borderstring_m .= "┼─" . ('─' x $cutoff) . "─┤"; $borderstring_m .= "┼─" . ('─' x $cutoff) . "─┤";
$borderstring_b .= "┴─" . ('─' x $cutoff) . "─┘"; $borderstring_b .= "┴─" . ('─' x $cutoff) . "─┘";
} else { } else {
$formatstring .= "| %-${cutoff}s |"; $formatstring .= "| %$alignstr${cutoff}s |";
$borderstring_m .= "+-" . ('-' x $cutoff) . "-+"; $borderstring_m .= "+-" . ('-' x $cutoff) . "-+";
} }
} else { } else {
if ($utf8) { if ($utf8) {
$formatstring .= "│ %-${cutoff}s "; $formatstring .= "│ %$alignstr${cutoff}s ";
$borderstring_t .= "┬─" . ('─' x $cutoff) . '─'; $borderstring_t .= "┬─" . ('─' x $cutoff) . '─';
$borderstring_m .= "┼─" . ('─' x $cutoff) . '─'; $borderstring_m .= "┼─" . ('─' x $cutoff) . '─';
$borderstring_b .= "┴─" . ('─' x $cutoff) . '─'; $borderstring_b .= "┴─" . ('─' x $cutoff) . '─';
} else { } else {
$formatstring .= "| %-${cutoff}s "; $formatstring .= "| %$alignstr${cutoff}s ";
$borderstring_m .= "+-" . ('-' x $cutoff) . '-'; $borderstring_m .= "+-" . ('-' x $cutoff) . '-';
} }
} }
} else { } else {
# skip alignment and cutoff on last column # skip alignment and cutoff on last column
$formatstring .= ($i == ($column_count - 1)) ? "%s" : "%-${cutoff}s "; $formatstring .= ($i == ($column_count - 1)) ? "%s" : "%$alignstr${cutoff}s ";
} }
} }