proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-25 20:07:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PVE::CLIHandler::print_text_table - fix sorting

Browse Source 
Sort only if at least one column contains no undefined values.
Sort according to the left-most such column.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2018-06-22 20:21:06 +02:00 committed by Dietmar Maurer
parent ec3cbded33
commit e05f7cdd0c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/PVE/CLIHandler.pm
View File

@ -449,10 +449,11 @@ sub data_to_text {
# the last column will never be cutoff # the last column will never be cutoff
# 'default' - optional default value for the column # 'default' - optional default value for the column
# formatopts element order defines column order (left to right) # formatopts element order defines column order (left to right)
# sorts the output according to the leftmost column not containing any undef
sub print_text_table { sub print_text_table {
my ($formatopts, $data) = @_; my ($formatopts, $data) = @_;
my ($formatstring, @keys, @titles, %cutoffs, %defaults); my ($formatstring, @keys, @titles, %cutoffs, %defaults, $sort_key);
my $last_col = $formatopts->[$#{$formatopts}]; my $last_col = $formatopts->[$#{$formatopts}];
foreach my $col ( @$formatopts ) { foreach my $col ( @$formatopts ) {
@ -467,11 +468,14 @@ sub print_text_table {
my $titlelen = length($title); my $titlelen = length($title);
my $longest = $titlelen; my $longest = $titlelen;
my $sortable = 1;
foreach my $entry (@$data) { foreach my $entry (@$data) {
my $len = length(data_to_text($entry->{$key})) // 0; my $len = length(data_to_text($entry->{$key})) // 0;
$longest = $len if $len > $longest; $longest = $len if $len > $longest;
$sortable = 0 if !defined($entry->{$key});
} }
$sort_key //= $key if $sortable;
$cutoff = (defined($cutoff) && $cutoff < $longest) ? $cutoff : $longest; $cutoff = (defined($cutoff) && $cutoff < $longest) ? $cutoff : $longest;
$cutoffs{$key} = $cutoff; $cutoffs{$key} = $cutoff;
@ -485,7 +489,10 @@ sub print_text_table {
printf $formatstring, @titles; printf $formatstring, @titles;
foreach my $entry (sort { $a->{$keys[0]} cmp $b->{$keys[0]} } @$data) { if (defined($sort_key)){
@$data = sort { $a->{$sort_key} cmp $b->{$sort_key} } @$data;
}
foreach my $entry (@$data) {
printf $formatstring, map { substr((data_to_text($entry->{$_}) // $defaults{$_}), 0 , $cutoffs{$_}) } @keys; printf $formatstring, map { substr((data_to_text($entry->{$_}) // $defaults{$_}), 0 , $cutoffs{$_}) } @keys;
} }
} }