X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FCLIHandler.pm;h=3013cc213dd2069365a67391c1b2a5f3b9a2c5cc;hp=a4f63ee8bdb2bf4550ed46b85c4bbaea6f6e7b74;hb=8dd3280b5547264ea36256101a193d29628a5f8d;hpb=8042c2cc6264a56683c96862cb831d9dde0d24c6

diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm
index a4f63ee..3013cc2 100644
--- a/src/PVE/CLIHandler.pm
+++ b/src/PVE/CLIHandler.pm
@@ -2,10 +2,12 @@ package PVE::CLIHandler;
 
 use strict;
 use warnings;
+use JSON;
 
 use PVE::SafeSyslog;
 use PVE::Exception qw(raise raise_param_exc);
 use PVE::RESTHandler;
+use PVE::PTY;
 use PVE::INotify;
 
 use base qw(PVE::RESTHandler);
@@ -37,6 +39,34 @@ my $cmddef;
 my $exename;
 my $cli_handler_class;
 
+my $standard_mappings = {
+    'pve-password' => {
+	name => 'password',
+	desc => '<password>',
+	interactive => 1,
+	func => sub {
+	    my ($value) = @_;
+	    return $value if $value;
+	    return PVE::PTY::get_confirmed_password();
+	},
+    },
+};
+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;
+}
+
 my $assert_initialized = sub {
     my @caller = caller;
     die "$caller[0]:$caller[2] - not initialized\n"
@@ -399,62 +429,152 @@ my $print_bash_completion = sub {
     &$print_result(@option_list);
 };
 
+sub data_to_text {
+    my ($data) = @_;
+
+    return '' if !defined($data);
+
+    if (my $class = ref($data)) {
+	return to_json($data, { utf8 => 1, canonical => 1 });
+    } else {
+	return "$data";
+    }
+}
+
 # prints a formatted table with a title row.
-# $formatopts is an array of hashes, with the following keys:
-# 'key' - the key in the data-objects to use for this column
-# 'title' - the title to print above the column, defaults to 'key' - always gets printed in full
-# 'cutoff' - the maximal length of the data, overlong values will be truncated
-# 'default' - an optional default value for the column
-# the last column always gets printed in full
+# $data - the data to print (array of objects)
+# $returnprops -json schema property description
+# $props_to_print - ordered list of properties to print
+# $sort_key is either a column name, or integer 1 which simply
+# sorts the output according to the leftmost column not containing
+# any undef. if not specified, we do not change order.
 sub print_text_table {
-    my ($formatopts, $data) = @_;
-    my ($formatstring, @keys, @titles, %cutoffs, %defaults, $last_col);
+    my ($data, $returnprops, $props_to_print, $sort_key) = @_;
 
-    $last_col = $formatopts->[$#{$formatopts}];
-    foreach my $col ( @$formatopts ) {
-	my ($key, $title, $cutoff, $default) = @$col{ qw(key title cutoff default)};
-	$title //= $key;
+    my $autosort = 0;
+    if (defined($sort_key) && ($sort_key eq 1)) {
+	$autosort = 1;
+	$sort_key = undef;
+    }
 
-	push @keys, $key;
-	push @titles, $title;
-	$defaults{$key} = $default;
+    my $colopts = {};
+    my $formatstring = '';
 
-	#calculate maximal print width and cutoff
+    my $column_count = scalar(@$props_to_print);
+
+    for (my $i = 0; $i < $column_count; $i++) {
+	my $prop = $props_to_print->[$i];
+	my $propinfo = $returnprops->{$prop};
+	die "undefined property '$prop'" if !$propinfo;
+
+	my $title = $propinfo->{title} // $prop;
+	my $cutoff = $propinfo->{print_width} // $propinfo->{maxLength};
+
+	# calculate maximal print width and cutoff
 	my $titlelen = length($title);
 
 	my $longest = $titlelen;
+	my $sortable = $autosort;
 	foreach my $entry (@$data) {
-	    my $len = length($entry->{$key}) // 0;
+	    my $len = length(data_to_text($entry->{$prop})) // 0;
 	    $longest = $len if $len > $longest;
+	    $sortable = 0 if !defined($entry->{$prop});
 	}
-
 	$cutoff = (defined($cutoff) && $cutoff < $longest) ? $cutoff : $longest;
-	$cutoffs{$key} = $cutoff;
+	$sort_key //= $prop if $sortable;
+
+	$colopts->{$prop} = {
+	    title => $title,
+	    default => $propinfo->{default} // '',
+	    cutoff => $cutoff,
+	};
 
-	my $printalign = $cutoff > $titlelen ? '-' : '';
-	if ($col == $last_col) {
-	    $formatstring .= "%${printalign}${titlelen}s\n";
+	$formatstring .= ($i == ($column_count - 1)) ? "%s\n" : "%-${cutoff}s ";
+    }
+
+    printf $formatstring, map { $colopts->{$_}->{title} } @$props_to_print;
+
+    if (defined($sort_key)) {
+	if ($returnprops->{$sort_key}->{type} eq 'integer' ||
+	    $returnprops->{$sort_key}->{type} eq 'number') {
+	    @$data = sort { $a->{$sort_key} <=> $b->{$sort_key} } @$data;
 	} else {
-	    $formatstring .= "%${printalign}${cutoff}s ";
+	    @$data = sort { $a->{$sort_key} cmp $b->{$sort_key} } @$data;
 	}
     }
 
-    printf $formatstring, @titles;
+    foreach my $entry (@$data) {
+        printf $formatstring, map {
+	    substr(data_to_text($entry->{$_}) // $colopts->{$_}->{default},
+		   0, $colopts->{$_}->{cutoff});
+	} @$props_to_print;
+    }
+}
 
-    foreach my $entry (sort { $a->{$keys[0]} cmp $b->{$keys[0]} } @$data){
-        printf $formatstring, map { substr(($entry->{$_} // $defaults{$_}), 0 , $cutoffs{$_}) } @keys;
+# prints the result of an API GET call returning an array as a table.
+# takes formatting information from the results property of the call
+# if $props_to_print is provided, prints only those columns. otherwise
+# 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) = @_;
+
+    die "can only print object lists\n"
+	if !($result_schema->{type} eq 'array' && $result_schema->{items}->{type} eq 'object');
+
+    my $returnprops = $result_schema->{items}->{properties};
+
+    if (!defined($props_to_print)) {
+	$props_to_print = [ sort keys %$returnprops ];
+	if (!scalar(@$props_to_print)) {
+	    my $all_props = {};
+	    foreach my $obj (@{$data}) {
+		foreach my $key (keys %{$obj}) {
+		    $all_props->{ $key } = 1;
+		}
+	    }
+	    $props_to_print = [ sort keys %{$all_props} ];
+	}
+	die "unable to detect list properties\n" if !scalar(@$props_to_print);
     }
+
+    print_text_table($data, $returnprops, $props_to_print, $sort_key);
 }
 
-sub print_entry {
-    my $entry = shift;
-    #TODO: handle objects/hashes as well
-    foreach my $item (sort keys %$entry) {
-	if (ref($entry->{$item}) eq 'ARRAY'){
-	    printf "%s: [ %s ]\n", $item, join(", ", @{$entry->{$item}});
+sub print_api_result {
+    my ($format, $data, $result_schema, $props_to_print, $sort_key) = @_;
+
+    return if $result_schema->{type} eq 'null';
+
+    if ($format eq 'json') {
+	print to_json($data, {utf8 => 1, allow_nonref => 1, canonical => 1, pretty => 1 });
+    } elsif ($format eq 'text') {
+	my $type = $result_schema->{type};
+	if ($type eq 'object') {
+	    if (defined($props_to_print)) {
+		foreach my $key (@$props_to_print) {
+		    print $key . ": " .  data_to_text($data->{$key}) . "\n";
+		}
+	    } else {
+		foreach my $key (sort keys %$data) {
+		    print $key . ": " .  data_to_text($data->{$key}) . "\n";
+		}
+	    }
+	} 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);
+	    } else {
+		foreach my $entry (@$data) {
+		    print data_to_text($entry) . "\n";
+		}
+	    }
 	} else {
-	    printf "%s: %s\n", $item, $entry->{$item};
+	    print "$data\n";
 	}
+    } else {
+	die "internal error: unknown output format"; # should not happen
     }
 }
 
@@ -559,7 +679,10 @@ my $handle_cmd  = sub {
 
     my $res = $class->cli_handler($cmd_str, $name, $cmd_args, $arg_param, $uri_param, $read_password_func, $param_mapping_func);
 
-    &$outsub($res) if $outsub;
+    if (defined $outsub) {
+	my $result_schema = $class->map_method_by_name($name)->{returns};
+	$outsub->($res, $result_schema);
+    }
 };
 
 my $handle_simple_cmd = sub {
@@ -594,7 +717,10 @@ my $handle_simple_cmd = sub {
 
     my $res = $class->cli_handler($name, $name, \@ARGV, $arg_param, $uri_param, $read_password_func, $param_mapping_func);
 
-    &$outsub($res) if $outsub;
+    if (defined $outsub) {
+	my $result_schema = $class->map_method_by_name($name)->{returns};
+	$outsub->($res, $result_schema);
+    }
 };
 
 sub run_cli_handler {