bump version to 4.0-61

[pve-common.git] / src / PVE / RESTHandler.pm

diff --git a/src/PVE/RESTHandler.pm b/src/PVE/RESTHandler.pm
index 60e915ba840d0df75688e7193f8ecca54fb8a723..3b9511419ceccc3dbb81d15812b4fb2798ec73b4 100644 (file)
--- a/src/PVE/RESTHandler.pm
+++ b/src/PVE/RESTHandler.pm
@@ -6,7 +6,6 @@ use warnings;
 use PVE::SafeSyslog;
 use PVE::Exception qw(raise raise_param_exc);
 use PVE::JSONSchema;
-use PVE::PodParser;
 use HTTP::Status qw(:constants :is status_message);
 use Text::Wrap;
 use Clone qw(clone);
@@ -34,10 +33,11 @@ sub api_clone_schema {
        foreach my $p (keys %$d) {
            my $pd = $d->{$p};
            if ($p =~ m/^([a-z]+)(\d+)$/) {
-               if ($2 == 0) {
-                   $p = "$1\[n\]";
-               } else {
-                   next;
+               my ($name, $idx) = ($1, $2);
+               if ($idx == 0) {
+                   $p = "${name}[n]";
+               } elsif (defined($d->{"${name}0"})) {
+                   next; # only handle once for -xx0, but only if -xx0 exists
                }
            }
            $res->{$k}->{$p} = ref($pd) ? clone($pd) : $pd;
@@ -407,7 +407,7 @@ sub handle {
 # $name: option name
 # $display_name: for example "-$name" of "<$name>", pass undef to use "$name:"
 # $phash: json schema property hash
-# $format: 'asciidoc', 'pod' or 'text'
+# $format: 'asciidoc', 'short', 'long' or 'full'
 # $style: 'config', 'arg' or 'fixed'
 my $get_property_description = sub {
     my ($name, $style, $phash, $format, $hidepw, $fileparams) = @_;
@@ -420,7 +420,7 @@ my $get_property_description = sub {
 
     chomp $descr;
 
-    my $type = PVE::PodParser::schema_get_type_text($phash);
+    my $type = PVE::JSONSchema::schema_get_type_text($phash);
 
     if ($hidepw && $name eq 'password') {
        $type = '';
@@ -466,7 +466,7 @@ my $get_property_description = sub {
        }
        $res .= "\n";
 
-    } elsif ($format eq 'pod' || $format eq 'text') {
+    } elsif ($format eq 'short' || $format eq 'long' || $format eq 'full') {
 
        my $defaulttxt = '';
        if (defined(my $dv = $phash->{default})) {
@@ -512,9 +512,9 @@ my $get_property_description = sub {
 #                  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)
-#   'short'    ... command line only (one line)
-#   'full'     ... also include description
+#   'long'     ... default (text, list all options)
+#   'short'    ... command line only (text, one line)
+#   'full'     ... text, include description
 #   'asciidoc' ... generate asciidoc for man pages (like 'full')
 # $hidepw      ... hide password option (use this if you provide a read passwork callback)
 # $stringfilemap ... mapping for string parameters to file path parameters
@@ -568,10 +568,12 @@ sub usage_str {
 
        my $base = $k;
        if ($k =~ m/^([a-z]+)(\d+)$/) {
-           my $name = $1;
+           my ($name, $idx) = ($1, $2);
            next if $idx_param->{$name};
-           $idx_param->{$name} = 1;
-           $base = "${name}[n]";
+           if ($idx == 0) {
+               $idx_param->{$name} = 1;
+               $base = "${name}[n]";
+           }
        }
 
        my $mapping = defined($stringfilemap) ? &$stringfilemap($name) : undef;
@@ -632,14 +634,17 @@ sub dump_properties {
 
        my $base = $k;
        if ($k =~ m/^([a-z]+)(\d+)$/) {
-           my $name = $1;
+           my ($name, $idx) = ($1, $2);
            next if $idx_param->{$name};
-           $idx_param->{$name} = 1;
-           $base = "${name}[n]";
+           if ($idx == 0) {
+               $idx_param->{$name} = 1;
+               $base = "${name}[n]";
+           }
        }
 
        $raw .= &$get_property_description($base, $style, $phash, $format, 0);
     }
+
     return $raw;
 }