X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FPodParser.pm;h=4f2868a0f6f3e427cae85bf0a93696298deb4c4b;hp=8ad05980f71ea63f1a28ca99b703db63d45028c6;hb=457c3fcb1e30d9e465cbaff9ea857d52a4a95e3c;hpb=7b1e4b04b2afd171e840bebde194735629608215

diff --git a/src/PVE/PodParser.pm b/src/PVE/PodParser.pm
index 8ad0598..4f2868a 100644
--- a/src/PVE/PodParser.pm
+++ b/src/PVE/PodParser.pm
@@ -49,8 +49,12 @@ sub generate_typetext {
     my $typetext = '';
     my (@optional, @required);
     foreach my $key (sort keys %$schema) {
-	next if !$schema->{$key}->{format_description} &&
-	        !$schema->{$key}->{typetext};
+	my $entry = $schema->{$key};
+	next if $entry->{alias};
+	next if !$entry->{format_description} &&
+	        !$entry->{typetext} &&
+	        !$entry->{enum} &&
+	        $entry->{type} ne 'boolean';
 	if ($schema->{$key}->{optional}) {
 	    push @optional, $key;
 	} else {
@@ -66,11 +70,17 @@ sub generate_typetext {
 	    $key = $alias;
 	    $entry = $schema->{$key};
 	}
-	if (my $desc = $entry->{format_description}) {
+	if (!defined($entry->{typetext})) {
 	    $typetext .= $entry->{default_key} ? "[$key=]" : "$key=";
+	}
+	if (my $desc = $entry->{format_description}) {
 	    $typetext .= "<$desc>";
 	} elsif (my $text = $entry->{typetext}) {
 	    $typetext .= $text;
+	} elsif (my $enum = $entry->{enum}) {
+	    $typetext .= '<' . join('|', @$enum) . '>';
+	} elsif ($entry->{type} eq 'boolean') {
+	    $typetext .= '<1|0>';
 	} else {
 	    die "internal error: neither format_description nor typetext found";
 	}
@@ -94,6 +104,8 @@ sub schema_get_type_text {
 
     if ($phash->{typetext}) {
 	return $phash->{typetext};
+    } elsif ($phash->{format_description}) {
+	return "<$phash->{format_description}>";
     } elsif ($phash->{enum}) {
 	return "(" . join(' | ', sort @{$phash->{enum}}) . ")";
     } elsif ($phash->{pattern}) {
@@ -125,6 +137,7 @@ sub generate_property_text {
     my $data = '';
     foreach my $key (sort keys %$schema) {
 	my $d = $schema->{$key};
+	next if $d->{alias};
 	my $desc = $d->{description};
 	my $typetext = schema_get_type_text($d);
 	$desc = 'No description available' if !$desc;
@@ -133,7 +146,7 @@ sub generate_property_text {
     return $data;
 }
 
-# generta epop from JSON schema properties
+# generate pod from JSON schema properties
 sub dump_properties {
     my ($properties) = @_;