proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-24 17:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve get_options (allow argument lists)

Browse Source 
So far it was possiple to specific lists by using option multiple times.

	vzdump --vmid 100 --vmid 101

or

	vzdump -vmid 100,101

No we can pass the vm list as arguments (not options)

	vzdump 100 101
This commit is contained in:
Dietmar Maurer 2011-10-14 08:29:39 +02:00
parent 1c50a24add
commit 1d21344cf5
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/PVE/JSONSchema.pm
View File

@ -849,7 +849,7 @@ sub method_get_child_link {
# a way to parse command line parameters, using a
# schema to configure Getopt::Long
sub get_options {
my ($schema, $args, $uri_param, $pwcallback) = @_;
my ($schema, $args, $uri_param, $pwcallback, $list_param) = @_;
if (!$schema || !$schema->{properties}) {
raise("too many arguments\n", code => HTTP_BAD_REQUEST)
@ -860,6 +860,7 @@ sub get_options {
my @getopt = ();
foreach my $prop (keys %{$schema->{properties}}) {
my $pd = $schema->{properties}->{$prop};
next if $prop eq $list_param;
next if defined($uri_param->{$prop});
if ($prop eq 'password' && $pwcallback) {
@ -882,6 +883,14 @@ sub get_options {
raise("unable to parse option\n", code => HTTP_BAD_REQUEST)
if !Getopt::Long::GetOptionsFromArray($args, $opts, @getopt);
if ($list_param) {
my $pd = $schema->{properties}->{$list_param} ||
die "no schema for list_param";
$opts->{$list_param} = $args;
$args = [];
}
raise("too many arguments\n", code => HTTP_BAD_REQUEST)
if scalar(@$args) != 0;

29
data/PVE/RESTHandler.pm
View File

@ -344,7 +344,8 @@ sub handle {
#
# $name ... the name of the method
# $prefix ... usually something like "$exename $cmd" ('pvesm add')
# $arg_param ... list of parameters we want to get as ordered arguments on the command line
# $arg_param ... list of parameters we want to get as ordered arguments
# on the command line (or single parameter name for lists)
# $fixed_param ... do not generate and info about those parameters
# $format:
# 'long' ... default (list all options)
@ -365,12 +366,20 @@ sub usage_str {
my $arg_hash = {};
my $args = '';
$arg_param = [ $arg_param ] if $arg_param && !ref($arg_param);
foreach my $p (@$arg_param) {
next if !$prop->{$p}; # just to be sure
my $pd = $prop->{$p};
$arg_hash->{$p} = 1;
$args .= " " if $args;
$args .= $prop->{$p} && $prop->{$p}->{optional} ? "[<$p>]" : "<$p>";
if ($pd->{format} && $pd->{format} =~ m/-list/) {
$args .= "{<vmid>}";
} else {
$args .= $pd->{optional} ? "[<$p>]" : "<$p>";
}
}
my $get_prop_descr = sub {
@ -473,13 +482,23 @@ sub cli_handler {
$param->{$p} = $fixed_param->{$p};
}
foreach my $p (@$arg_param) {
$param->{$p} = shift @$args if $args->[0] && $args->[0] !~ m/^-/;
my $list_param;
if ($arg_param) {
if (ref($arg_param)) {
foreach my $p (@$arg_param) {
$param->{$p} = shift @$args if $args->[0] && $args->[0] !~ m/^-/;
}
} else {
my $pd = $info->{parameters}->{properties}->{$arg_param};
die "expected list format $pd->{format}"
if !($pd && $pd->{format} && $pd->{format} =~ m/-list/);
$list_param = $arg_param;
}
}
my $res;
eval {
my $param = PVE::JSONSchema::get_options($info->{parameters}, $args, $param, $pwcallback);
my $param = PVE::JSONSchema::get_options($info->{parameters}, $args, $param, $pwcallback, $list_param);
$res = $self->handle($info, $param);
};