cli: print_text_table: allow to limit output width

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>

diff --git a/src/PVE/CLIFormatter.pm b/src/PVE/CLIFormatter.pm
index 38d4eecd3f63b61a09805330a3db3be17b225003..af7a01b851e7961fb9b76f0db094799e13c1f121 100644 (file)
--- a/src/PVE/CLIFormatter.pm
+++ b/src/PVE/CLIFormatter.pm
@@ -5,6 +5,19 @@ use warnings;
 use PVE::JSONSchema;
 use JSON;
 
 use PVE::JSONSchema;
 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 {
     my ($data, $propdef) = @_;
 
 sub data_to_text {
     my ($data, $propdef) = @_;
 


@@ -41,7 +54,7 @@ sub data_to_text {
 #   turned off by passing 0 as $sort_key
 # $border - print with/without table header and asciiart border
 sub print_text_table {
 #   turned off by passing 0 as $sort_key
 # $border - print with/without table header and asciiart border
 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;
     if (defined($sort_key) && $sort_key eq 0) {
 
     my $autosort = 1;
     if (defined($sort_key) && $sort_key eq 0) {


@@ -105,17 +118,19 @@ sub print_text_table {
        }
     }
 
        }
     }
 

-    print $borderstring if $border;
-    printf $formatstring, map { $colopts->{$_}->{title} } @$props_to_print;
+    println_max($borderstring, $columns) if $border;
+    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;
-        printf $formatstring, map {
+       println_max($borderstring, $columns) if $border;
+        $text = sprintf $formatstring, map {

            substr(data_to_text($entry->{$_}, $returnprops->{$_}) // $colopts->{$_}->{default},
                   0, $colopts->{$_}->{cutoff});
        } @$props_to_print;
            substr(data_to_text($entry->{$_}, $returnprops->{$_}) // $colopts->{$_}->{default},
                   0, $colopts->{$_}->{cutoff});
        } @$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
 # to all fields occuring in items of $data.
 sub print_api_list {
 # takes all fields of the results property, with a fallback
 # to all fields occuring in items of $data.
 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"
        if !($result_schema->{type} eq 'array' && $result_schema->{items}->{type} eq 'object');
 
     die "can only print object lists\n"
        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}) };
            }
            my $schema = { type => 'array', items => { type => 'object' }};
                push @$kvstore, { key => $key, value => data_to_text($data->{$key}, $result_schema->{properties}->{$key}) };
            }
            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') {
            return if !scalar(@$data);
            my $item_type = $result_schema->{items}->{type};
            if ($item_type eq 'object') {
        } elsif ($type eq 'array') {
            return if !scalar(@$data);
            my $item_type = $result_schema->{items}->{type};
            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 {
                foreach my $entry (@$data) {
                    print data_to_text($entry) . "\n";
            } else {
                foreach my $entry (@$data) {
                    print data_to_text($entry) . "\n";