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);
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 && defined($d->{"${name}1"})) {
+ $p = "${name}[n]";
+ } elsif (defined($d->{"${name}0"})) {
+ next; # only handle once for -xx0, but only if -xx0 exists
+ }
+ }
+ my $tmp = ref($pd) ? clone($pd) : $pd;
+ # NOTE: add typetext property for more complex types, to
+ # make the web api viewer code simpler
+ if (!(defined($tmp->{enum}) || defined($tmp->{pattern}))) {
+ my $typetext = PVE::JSONSchema::schema_get_type_text($tmp);
+ if ($tmp->{type} && ($tmp->{type} ne $typetext)) {
+ $tmp->{typetext} = $typetext;
}
}
- $res->{$k}->{$p} = ref($pd) ? clone($pd) : $pd;
+ $res->{$k}->{$p} = $tmp;
}
}
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 {
# $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'
-# $style: 'config', 'arg' or 'fixed'
+# $format: 'asciidoc', 'short', 'long' or 'full'
+# $style: 'config', 'config-sub', 'arg' or 'fixed'
my $get_property_description = sub {
- my ($name, $style, $phash, $format, $hidepw) = @_;
+ my ($name, $style, $phash, $format, $hidepw, $fileparams) = @_;
my $res = '';
my $descr = $phash->{description} || "no description available";
+ if ($phash->{verbose_description} &&
+ ($style eq 'config' || $style eq 'config-sub')) {
+ $descr = $phash->{verbose_description};
+ }
+
chomp $descr;
- my $type = PVE::PodParser::schema_get_type_text($phash);
+ my $type = PVE::JSONSchema::schema_get_type_text($phash, $style);
if ($hidepw && $name eq 'password') {
$type = '';
}
+ if ($fileparams && $type eq 'string') {
+ foreach my $elem (@$fileparams) {
+ if ($name eq $elem) {
+ $type = '<filepath>';
+ last;
+ }
+ }
+ }
+
if ($format eq 'asciidoc') {
if ($style eq 'config') {
$res .= "`$name`: ";
+ } elsif ($style eq 'config-sub') {
+ $res .= "`$name`=";
} elsif ($style eq 'arg') {
$res .= "`-$name` ";
} elsif ($style eq 'fixed') {
- $res .= "`<$name>` ";
+ $res .= "`<$name>`: ";
} else {
die "unknown style '$style'";
}
$res .= "`$type` " if $type;
if (defined(my $dv = $phash->{default})) {
- $res .= "(default=`$dv`)";
+ $res .= "('default =' `$dv`)";
+ }
+
+ if ($style eq 'config-sub') {
+ $res .= ";;\n\n";
+ } else {
+ $res .= "::\n\n";
}
- $res .= "::\n\n";
- my $wdescr = Text::Wrap::wrap('', '', ($descr));
+ my $wdescr = $descr;
chomp $wdescr;
$wdescr =~ s/^$/+/mg;
}
$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})) {
# 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
sub usage_str {
- my ($self, $name, $prefix, $arg_param, $fixed_param, $format, $hidepw) = @_;
+ my ($self, $name, $prefix, $arg_param, $fixed_param, $format, $hidepw, $stringfilemap) = @_;
$format = 'long' if !$format;
foreach my $k (@$arg_param) {
next if defined($fixed_param->{$k}); # just to be sure
next if !$prop->{$k}; # just to be sure
- $argdescr .= &$get_property_description($k, 'fixed', $prop->{$k}, 'text', 0);
+ $argdescr .= &$get_property_description($k, 'fixed', $prop->{$k}, $format, 0);
}
my $idx_param = {}; # -vlan\d+ -scsi\d+
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 && defined($prop->{"${name}1"})) {
+ $idx_param->{$name} = 1;
+ $base = "${name}[n]";
+ }
}
- $opts .= &$get_property_description($base, 'arg', $prop->{$k}, 'text', $hidepw);
+ my $mapping = defined($stringfilemap) ? &$stringfilemap($name) : undef;
+ $opts .= &$get_property_description($base, 'arg', $prop->{$k}, $format,
+ $hidepw, $mapping);
if (!$prop->{$k}->{optional}) {
$args .= " " if $args;
my $phash = $prop->{$k};
next if defined($filterFn) && &$filterFn($k, $phash);
-
- my $type = $phash->{type} || 'string';
+ next if $phash->{alias};
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 && defined($prop->{"${name}1"})) {
+ $idx_param->{$name} = 1;
+ $base = "${name}[n]";
+ }
}
$raw .= &$get_property_description($base, $style, $phash, $format, 0);
+
+ next if $style ne 'config';
+
+ my $prop_fmt = $phash->{format};
+ next if !$prop_fmt;
+
+ if (ref($prop_fmt) ne 'HASH') {
+ $prop_fmt = PVE::JSONSchema::get_format($prop_fmt);
+ }
+
+ next if !(ref($prop_fmt) && (ref($prop_fmt) eq 'HASH'));
+
+ $raw .= dump_properties($prop_fmt, $format, 'config-sub')
+
}
+
return $raw;
}
+my $replace_file_names_with_contents = sub {
+ my ($param, $mapping) = @_;
+
+ if ($mapping) {
+ foreach my $elem ( @$mapping ) {
+ $param->{$elem} = PVE::Tools::file_get_contents($param->{$elem})
+ if defined($param->{$elem});
+ }
+ }
+
+ return $param;
+};
+
sub cli_handler {
- my ($self, $prefix, $name, $args, $arg_param, $fixed_param, $pwcallback) = @_;
+ my ($self, $prefix, $name, $args, $arg_param, $fixed_param, $pwcallback, $stringfilemap) = @_;
my $info = $self->map_method_by_name($name);
my $res;
eval {
my $param = PVE::JSONSchema::get_options($info->{parameters}, $args, $arg_param, $fixed_param, $pwcallback);
+ &$replace_file_names_with_contents($param, &$stringfilemap($name))
+ if defined($stringfilemap);
$res = $self->handle($info, $param);
};
if (my $err = $@) {
die $err if !$ec || $ec ne "PVE::Exception" || !$err->is_param_exc();
- $err->{usage} = $self->usage_str($name, $prefix, $arg_param, $fixed_param, 'short', $pwcallback);
+ $err->{usage} = $self->usage_str($name, $prefix, $arg_param, $fixed_param, 'short', $pwcallback, $stringfilemap);
die $err;
}
projects / pve-common.git / blobdiff