daemon: refactor and cleanup

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

diff --git a/src/PVE/RESTHandler.pm b/src/PVE/RESTHandler.pm
index 4b67c614f336c1fc52c1a70d0234847163aa6b95..5c1d419d2eebb89374603ea6fbe81de7c0690ecf 100644 (file)
--- a/src/PVE/RESTHandler.pm
+++ b/src/PVE/RESTHandler.pm
@@ -249,31 +249,6 @@ sub register_method {
     push @{$method_registry->{$self}}, $info;
 }
 
-sub register_page_formatter {
-    my ($self, %config) = @_;
-
-    my $format = $config{format} ||
-       die "missing format";
-
-    my $path = $config{path} ||
-       die "missing path";
-
-    my $method = $config{method} ||
-       die "missing method";
-       
-    my $code = $config{code} ||
-       die "missing formatter code";
-    
-    my $uri_param = {};
-    my ($handler, $info) = $self->find_handler($method, $path, $uri_param);
-    die "unabe to find handler for '$method: $path'" if !($handler && $info);
-
-    die "duplicate formatter for '$method: $path'" 
-       if $info->{formatter} && $info->{formatter}->{$format};
-
-    $info->{formatter}->{$format} = $code;
-}
-
 sub DESTROY {}; # avoid problems with autoload
 
 sub AUTOLOAD {
@@ -417,7 +392,7 @@ sub handle {
 # $display_name: for example "-$name" of "<$name>", pass undef to use "$name:"
 # $phash: json schema property hash
 # $format: 'asciidoc', 'short', 'long' or 'full'
-# $style: 'config', 'arg' or 'fixed'
+# $style: 'config', 'config-sub', 'arg' or 'fixed'
 my $get_property_description = sub {
     my ($name, $style, $phash, $format, $hidepw, $fileparams) = @_;
 
@@ -434,16 +409,16 @@ my $get_property_description = sub {
 
     chomp $descr;
 
-    my $type = PVE::JSONSchema::schema_get_type_text($phash);
+    my $type_text = PVE::JSONSchema::schema_get_type_text($phash, $style);
 
     if ($hidepw && $name eq 'password') {
-       $type = '';
+       $type_text = '';
     }
 
-    if ($fileparams && $type eq 'string') {
+    if ($fileparams && $phash->{type} eq 'string') {
        foreach my $elem (@$fileparams) {
            if ($name eq $elem) {
-               $type = '<filepath>';
+               $type_text = '<filepath>';
                last;
            }
        }
@@ -456,14 +431,14 @@ my $get_property_description = sub {
        } elsif ($style eq 'config-sub') {
            $res .= "`$name`=";
        } elsif ($style eq 'arg') {
-           $res .= "`-$name` ";
+           $res .= "`--$name` ";
        } elsif ($style eq 'fixed') {
-           $res .= "`<$name>` ";
+           $res .= "`<$name>`: ";
        } else {
            die "unknown style '$style'";
        }
 
-       $res .= "`$type` " if $type;
+       $res .= "`$type_text` " if $type_text;
 
        if (defined(my $dv = $phash->{default})) {
            $res .= "('default =' `$dv`)";
@@ -505,7 +480,7 @@ my $get_property_description = sub {
            die "unknown style '$style'";
        }
 
-       my $tmp = sprintf "  %-10s %s$defaulttxt\n", $display_name, "$type";
+       my $tmp = sprintf "  %-10s %s$defaulttxt\n", $display_name, "$type_text";
        my $indend = "             ";
 
        $res .= Text::Wrap::wrap('', $indend, ($tmp));
@@ -583,7 +558,7 @@ sub usage_str {
        next if $arg_hash->{$k};
        next if defined($fixed_param->{$k});
 
-       my $type = $prop->{$k}->{type} || 'string';
+       my $type_text = $prop->{$k}->{type} || 'string';
 
        next if $hidepw && ($k eq 'password') && !$prop->{$k}->{optional};
 
@@ -603,7 +578,7 @@ sub usage_str {
 
        if (!$prop->{$k}->{optional}) {
            $args .= " " if $args;
-           $args .= "-$base <$type>"
+           $args .= "--$base <$type_text>"
        }
     }