CLIHandler: add standard_mappings

[pve-common.git] / src / PVE / CLIHandler.pm

diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm
index 1b95d9a1fd499346fb36ef8555b16bebc0908dba..810467d46eb28db8ac2a997901a0a22cb1b787ea 100644 (file)
--- a/src/PVE/CLIHandler.pm
+++ b/src/PVE/CLIHandler.pm
@@ -69,6 +69,24 @@ my $get_commands = sub {
 
 my $complete_command_names = sub { $get_commands->($cmddef) };
 
+my $standard_mappings = { };
+
+sub get_standard_mapping {
+    my ($name, $base) = @_;
+
+    my $std =  $standard_mappings->{$name};
+    die "no such standard mapping '$name'\n" if !$std;
+
+    my $res = $base || {};
+
+    foreach my $opt (keys %$std) {
+       next if defined($res->{$opt});
+       $res->{$opt} = $std->{$opt};
+    }
+
+    return $res;
+}
+
 # traverses the command definition using the $argv array, resolving one level
 # of aliases.
 # Returns the matching (sub) command and its definition, and argument array for
@@ -409,18 +427,19 @@ my $print_bash_completion = sub {
 # formatopts element order defines column order (left to right)
 sub print_text_table {
     my ($formatopts, $data) = @_;
-    my ($formatstring, @keys, @titles, %cutoffs, %defaults, $last_col);
 
-    $last_col = $formatopts->[$#{$formatopts}];
+    my ($formatstring, @keys, @titles, %cutoffs, %defaults);
+    my $last_col = $formatopts->[$#{$formatopts}];
+
     foreach my $col ( @$formatopts ) {
-       my ($key, $title, $cutoff, $default) = @$col{ qw(key title cutoff default)};
+       my ($key, $title, $cutoff, $default) = @$col{qw(key title cutoff default)};
        $title //= $key;
 
        push @keys, $key;
        push @titles, $title;
        $defaults{$key} = $default;
 
-       #calculate maximal print width and cutoff
+       # calculate maximal print width and cutoff
        my $titlelen = length($title);
 
        my $longest = $titlelen;
@@ -442,16 +461,17 @@ sub print_text_table {
 
     printf $formatstring, @titles;
 
-    foreach my $entry (sort { $a->{$keys[0]} cmp $b->{$keys[0]} } @$data){
+    foreach my $entry (sort { $a->{$keys[0]} cmp $b->{$keys[0]} } @$data) {
         printf $formatstring, map { substr(($entry->{$_} // $defaults{$_}), 0 , $cutoffs{$_}) } @keys;
     }
 }
 
 sub print_entry {
     my $entry = shift;
+
     #TODO: handle objects/hashes as well
     foreach my $item (sort keys %$entry) {
-       if (ref($entry->{$item}) eq 'ARRAY'){
+       if (ref($entry->{$item}) eq 'ARRAY') {
            printf "%s: [ %s ]\n", $item, join(", ", @{$entry->{$item}});
        } else {
            printf "%s: %s\n", $item, $entry->{$item};
@@ -463,8 +483,12 @@ sub print_entry {
 # and to have the results key of the API call defined.
 sub print_api_list {
     my ($props_to_print, $data, $returninfo) = @_;
-    my $formatopts;
+
+    die "can only print array result" if $returninfo->{type} ne 'array';
+
     my $returnprops = $returninfo->{items}->{properties};
+
+    my $formatopts = [];
     foreach my $prop ( @$props_to_print ) {
        my $propinfo = $returnprops->{$prop};
        my $colopts = {