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

cli: print_text_table: allow to limit output width

Browse Source 
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
Dietmar Maurer 2018-06-29 13:15:20 +02:00 committed by Thomas Lamprecht
parent 84142f1d20
commit cde31da01a
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/PVE/CLIFormatter.pm
View File

@ -5,6 +5,19 @@ use warnings;
use PVE::JSONSchema; use PVE::JSONSchema;
use JSON; use JSON;
sub println_max {
my ($text, $max) = @_;
if ($max) {
my @lines = split(/\n/, $text);
foreach my $line (@lines) {
print substr($line, 0, $max) . "\n";
}
} else {
print $text;
}
}
sub data_to_text { sub data_to_text {
my ($data, $propdef) = @_; my ($data, $propdef) = @_;
@ -41,7 +54,7 @@ sub data_to_text {
# turned off by passing 0 as $sort_key # turned off by passing 0 as $sort_key
# $border - print with/without table header and asciiart border # $border - print with/without table header and asciiart border
sub print_text_table { sub print_text_table {
my ($data, $returnprops, $props_to_print, $sort_key, $border) = @_; my ($data, $returnprops, $props_to_print, $sort_key, $border, $columns) = @_;
my $autosort = 1; my $autosort = 1;
if (defined($sort_key) && $sort_key eq 0) { if (defined($sort_key) && $sort_key eq 0) {
@ -105,17 +118,19 @@ sub print_text_table {
} }
} }
print $borderstring if $border; println_max($borderstring, $columns) if $border;
printf $formatstring, map { $colopts->{$_}->{title} } @$props_to_print; my $text = sprintf $formatstring, map { $colopts->{$_}->{title} } @$props_to_print;
println_max($text, $columns);
foreach my $entry (@$data) { foreach my $entry (@$data) {
print $borderstring if $border; println_max($borderstring, $columns) if $border;
printf $formatstring, map { $text = sprintf $formatstring, map {
substr(data_to_text($entry->{$_}, $returnprops->{$_}) // $colopts->{$_}->{default}, substr(data_to_text($entry->{$_}, $returnprops->{$_}) // $colopts->{$_}->{default},
0, $colopts->{$_}->{cutoff}); 0, $colopts->{$_}->{cutoff});
} @$props_to_print; } @$props_to_print;
println_max($text, $columns);
} }
print $borderstring if $border; println_max($borderstring, $columns) if $border;
} }
# prints the result of an API GET call returning an array as a table. # prints the result of an API GET call returning an array as a table.
@ -124,7 +139,7 @@ sub print_text_table {
# takes all fields of the results property, with a fallback # takes all fields of the results property, with a fallback
# to all fields occuring in items of $data. # to all fields occuring in items of $data.
sub print_api_list { sub print_api_list {
my ($data, $result_schema, $props_to_print, $sort_key, $border) = @_; my ($data, $result_schema, $props_to_print, $sort_key, $border, $columns) = @_;
die "can only print object lists\n" die "can only print object lists\n"
if !($result_schema->{type} eq 'array' && $result_schema->{items}->{type} eq 'object'); if !($result_schema->{type} eq 'array' && $result_schema->{items}->{type} eq 'object');
@ -145,11 +160,11 @@ sub print_api_list {
die "unable to detect list properties\n" if !scalar(@$props_to_print); die "unable to detect list properties\n" if !scalar(@$props_to_print);
} }
print_text_table($data, $returnprops, $props_to_print, $sort_key, $border); print_text_table($data, $returnprops, $props_to_print, $sort_key, $border, $columns);
} }
sub print_api_result { sub print_api_result {
my ($format, $data, $result_schema, $props_to_print, $sort_key) = @_; my ($format, $data, $result_schema, $props_to_print, $sort_key, $columns) = @_;
return if $result_schema->{type} eq 'null'; return if $result_schema->{type} eq 'null';
@ -164,12 +179,12 @@ sub print_api_result {
push @$kvstore, { key => $key, value => data_to_text($data->{$key}, $result_schema->{properties}->{$key}) }; push @$kvstore, { key => $key, value => data_to_text($data->{$key}, $result_schema->{properties}->{$key}) };
} }
my $schema = { type => 'array', items => { type => 'object' }}; my $schema = { type => 'array', items => { type => 'object' }};
print_api_list($kvstore, $schema, ['key', 'value'], 0, $format eq 'text'); print_api_list($kvstore, $schema, ['key', 'value'], 0, $format eq 'text', $columns);
} elsif ($type eq 'array') { } elsif ($type eq 'array') {
return if !scalar(@$data); return if !scalar(@$data);
my $item_type = $result_schema->{items}->{type}; my $item_type = $result_schema->{items}->{type};
if ($item_type eq 'object') { if ($item_type eq 'object') {
print_api_list($data, $result_schema, $props_to_print, $sort_key, $format eq 'text'); print_api_list($data, $result_schema, $props_to_print, $sort_key, $format eq 'text', $columns);
} else { } else {
foreach my $entry (@$data) { foreach my $entry (@$data) {
print data_to_text($entry) . "\n"; print data_to_text($entry) . "\n";