use strict;
use warnings;
+use JSON;
use PVE::SafeSyslog;
use PVE::Exception qw(raise raise_param_exc);
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"
my $complete_command_names = sub { $get_commands->($cmddef) };
-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;
-}
-
# 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
&$print_result(@option_list);
};
+sub data_to_text {
+ my ($data) = @_;
+
+ return undef 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' - key of $data element to print
my $last_col = $formatopts->[$#{$formatopts}];
foreach my $col ( @$formatopts ) {
- my ($key, $title, $cutoff, $default) = @$col{qw(key title cutoff default)};
+ my ($key, $title, $cutoff) = @$col{qw(key title cutoff)};
$title //= $key;
push @keys, $key;
push @titles, $title;
- $defaults{$key} = $default;
+ $defaults{$key} = $col->{default} // '';
# calculate maximal print width and cutoff
my $titlelen = length($title);
my $longest = $titlelen;
foreach my $entry (@$data) {
- my $len = length($entry->{$key}) // 0;
+ my $len = length(data_to_text($entry->{$key})) // 0;
$longest = $len if $len > $longest;
}
printf $formatstring, @titles;
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') {
- printf "%s: [ %s ]\n", $item, join(", ", @{$entry->{$item}});
- } else {
- printf "%s: %s\n", $item, $entry->{$item};
- }
+ printf $formatstring, map { substr((data_to_text($entry->{$_}) // $defaults{$_}), 0 , $cutoffs{$_}) } @keys;
}
}
print_text_table($formatopts, $data);
}
+sub print_api_result {
+ my ($format, $data, $result_schema) = @_;
+
+ 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') {
+ 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') {
+ my $prop_list = [ sort keys %{$result_schema->{items}->{properties}}];
+ print_api_list($prop_list, $data, $result_schema);
+ } else {
+ foreach my $entry (@$data) {
+ print data_to_text($entry) . "\n";
+ }
+ }
+ } else {
+ print "$data\n";
+ }
+ } else {
+ die "internal error: unknown output format"; # should not happen
+ }
+}
+
sub verify_api {
my ($class) = @_;