my $pve_api_definition_fn = "/usr/share/pve-client/pve-api-definition.dat";
-my $method_map = {
+our $method_map = {
create => 'POST',
set => 'PUT',
get => 'GET',
delete => 'DELETE',
};
-my $default_output_format = 'text';
-my $client_output_format = $default_output_format;
-
-sub set_output_format {
- my ($format) = @_;
-
- if (!defined($format)) {
- $client_output_format = $default_output_format;
- } else {
- $client_output_format = $format;
- }
-}
-
-sub get_output_format {
- return $client_output_format;
-}
-
my $__real_remove_formats; $__real_remove_formats = sub {
my ($properties) = @_;
if (my $children = $info->{children}) {
foreach my $c (@$children) {
my $ctext = $c->{text};
+ push @$res, "${prefix}$ctext" if $ctext =~ m/^\Q$rest/;
if ($ctext =~ m/^\{(\S+)\}$/) {
- push @$res, "$prefix$ctext";
- push @$res, "$prefix$ctext/";
- if (length($rest)) {
+ if (length($rest) && $rest ne $ctext) {
push @$res, "$prefix$rest";
- push @$res, "$prefix$rest/";
}
- } elsif ($ctext =~ m/^\Q$rest/) {
- push @$res, "$prefix$ctext";
- push @$res, "$prefix$ctext/" if $c->{children};
}
}
}
}
+ if (scalar(@$res) == 1) {
+ $res = [$res->[0], "$res->[0]/"];
+ }
+
return $res;
}
return [ grep { ($ind++ % 2) == 0 } @$list ];
}
-sub print_result {
- my ($data, $result_schema, $param_order) = @_;
-
- my $options = {};
- PVE::APIClient::CLIFormatter::query_terminal_options($options);
-
- my $format = get_output_format();
- PVE::APIClient::CLIFormatter::print_api_result(
- $format, $data, $result_schema, $param_order, $options);
-}
-
sub print_ordered_result {
- my ($property_list, $data, $result_schema) = @_;
+ my ($property_list, $data, $result_schema, $options) = @_;
my $param_order = extract_even_elements($property_list);
- print_result($data, $result_schema, $param_order);
+ PVE::APIClient::CLIFormatter::print_api_result($data, $result_schema, $param_order, $options);
}
1;