use strict;
use warnings;
+
use Digest::SHA;
+
use PVE::Exception qw(raise_param_exc);
use PVE::JSONSchema qw(get_standard_option);
-use Data::Dumper;
-
my $defaultData = {
options => {},
plugins => {},
sub options {
return {};
-}
+}
sub plugindata {
return {};
-}
+}
sub createSchema {
- my ($class) = @_;
+ my ($class, $skip_type) = @_;
my $pdata = $class->private();
my $propertyList = $pdata->{propertyList};
};
foreach my $p (keys %$propertyList) {
+ next if $skip_type && $p eq 'type';
+
if (!$propertyList->{$p}->{optional}) {
$props->{$p} = $propertyList->{$p};
next;
my ($class) = @_;
my $pdata = $class->private();
-
+
return [ sort keys %{$pdata->{plugins}} ];
}
return $value if $key eq 'type' && $type eq $value;
my $opts = $pdata->{options}->{$type};
- die "unknown section type '$type'\n" if !$opts;
+ die "unknown section type '$type'\n" if !$opts;
die "unexpected property '$key'\n" if !defined($opts->{$key});
}
}
+ if ($ct eq 'boolean' || $ct eq 'integer' || $ct eq 'number') {
+ return $value + 0; # convert to number
+ }
+
return $value;
}
}
sub format_section_header {
- my ($class, $type, $sectionId) = @_;
+ my ($class, $type, $sectionId, $scfg, $done_hash) = @_;
return "$type: $sectionId\n";
}
$raw = '' if !defined($raw);
my $digest = Digest::SHA::sha1_hex($raw);
-
+
my $pri = 1;
my $lineno = 0;
my @lines = split(/\n/, $raw);
my $nextline = sub {
- while (my $line = shift @lines) {
+ while (defined(my $line = shift @lines)) {
$lineno++;
- return $line if $line !~ /^\s*(?:#|$)/;
+ return $line if ($line !~ /^\s*#/);
}
};
- while (my $line = &$nextline()) {
+ while (@lines) {
+ my $line = $nextline->();
+ next if !$line;
+
my $errprefix = "file $filename line $lineno";
my ($type, $sectionId, $errmsg, $config) = $class->parse_section_header($line);
}
}
- while ($line = &$nextline()) {
+ while ($line = $nextline->()) {
next if $ignore; # skip
$errprefix = "file $filename line $lineno";
if ($line =~ m/^\s+(\S+)(\s+(.*\S))?\s*$/) {
my ($k, $v) = ($1, $3);
-
+
eval {
die "duplicate attribute\n" if defined($config->{$k});
$config->{$k} = $plugin->check_value($type, $k, $v, $sectionId);
foreach my $k (keys %$config) {
my $value = $config->{$k};
-
+
die "can't change value of fixed parameter '$k'\n"
- if !$create && $opts->{$k}->{fixed};
-
+ if !$create && defined($opts->{$k}) && $opts->{$k}->{fixed};
+
if (defined($value)) {
my $tmp = $class->check_value($type, $k, $value, $sectionId, $skipSchemaCheck);
$settings->{$k} = $class->decode_value($type, $k, $tmp);
my $maxpri = 0;
foreach my $sectionId (keys %$ids) {
- my $pri = $order->{$sectionId};
+ my $pri = $order->{$sectionId};
$maxpri = $pri if $pri && $pri > $maxpri;
}
foreach my $sectionId (keys %$ids) {
if (!defined ($order->{$sectionId})) {
$order->{$sectionId} = ++$maxpri;
- }
+ }
}
foreach my $sectionId (sort {$order->{$a} <=> $order->{$b}} keys %$ids) {
die "unknown section type '$type'\n" if !$opts;
- my $data = $class->format_section_header($type, $sectionId);
- if ($scfg->{comment}) {
+ my $done_hash = {};
+
+ my $data = $class->format_section_header($type, $sectionId, $scfg, $done_hash);
+ if ($scfg->{comment} && !$done_hash->{comment}) {
my $k = 'comment';
my $v = $class->encode_value($type, $k, $scfg->{$k});
$data .= &$format_config_line($propertyList->{$k}, $k, $v);
}
- $data .= "\tdisable\n" if $scfg->{disable};
+ $data .= "\tdisable\n" if $scfg->{disable} && !$done_hash->{disable};
- my $done_hash = { comment => 1, disable => 1};
+ $done_hash->{comment} = 1;
+ $done_hash->{disable} = 1;
my @option_keys = sort keys %$opts;
foreach my $k (@option_keys) {
+ next if defined($done_hash->{$k});
next if $opts->{$k}->{optional};
$done_hash->{$k} = 1;
my $v = $scfg->{$k};