Proxmox/pve-common
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-common.git synced 2024-12-24 01:33:48 +03:00
Code Releases Activity

allow list format in getopts

Browse Source
This commit is contained in:
Dietmar Maurer 2011-10-12 11:40:45 +02:00
parent d2b0374d48
commit 8ba7c72bd1
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
data/PVE/JSONSchema.pm
View File

@ -82,6 +82,9 @@ sub register_format {
}
# register some common type for pve
register_format('string', sub {}); # allow format => 'string-list'
register_format('pve-configid', \&pve_verify_configid);
sub pve_verify_configid {
my ($id, $noerr) = @_;
@ -867,7 +870,11 @@ sub get_options {
} elsif ($pd->{type} eq 'boolean') {
push @getopt, "$prop:s";
} else {
push @getopt, "$prop=s";
if ($pd->{format} && $pd->{format} =~ m/-list/) {
push @getopt, "$prop=s@";
} else {
push @getopt, "$prop=s";
}
}
}
@ -898,6 +905,22 @@ sub get_options {
} else {
raise("unable to parse boolean option\n", code => HTTP_BAD_REQUEST);
}
} elsif ($pd->{format} && $pd->{format} =~ m/-list/) {
if ($pd->{format} eq 'pve-vmid-list') {
# allow --vmid 100 --vmid 101 and --vmid 100,101
$opts->{$p} = join(",", @{$opts->{$p}});
} else {
# we encode array as \0 separated strings
# Note: CGI.pm also use this encoding
if (scalar(@{$opts->{$p}}) != 1) {
$opts->{$p} = join("\0", @{$opts->{$p}});
} else {
# st that split_list knows it is \0 terminated
my $v = $opts->{$p}->[0];
$opts->{$p} = "$v\0";
}
}
}
}
}