proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-04-29 03:05:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

schema: parse_config: optionally collect comments

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2022-03-17 11:26:03 +01:00 committed by Thomas Lamprecht
parent 6ac98ad562
commit 2f85ab8fde
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/PVE/JSONSchema.pm
View File

@ -1823,8 +1823,8 @@ sub get_options {
}
# A way to parse configuration data by giving a json schema
sub parse_config {
my ($schema, $filename, $raw) = @_;
sub parse_config : prototype($$$;$) {
my ($schema, $filename, $raw, $comment_key) = @_;
# do fast check (avoid validate_schema($schema))
die "got strange schema" if !$schema->{type} ||
@ -1832,10 +1832,24 @@ sub parse_config {
my $cfg = {};
my $comment_data;
my $handle_comment = sub { $_[0] =~ /^#/ };
if (defined($comment_key)) {
$comment_data = '';
my $comment_re = qr/^\Q$comment_key\E:\s*(.*\S)\s*$/;
$handle_comment = sub {
if ($_[0] =~ /^\#(.*)\s*$/ || $_[0] =~ $comment_re) {
$comment_data .= PVE::Tools::decode_text($1) . "\n";
return 1;
}
return undef;
};
}
while ($raw =~ /^\s*(.+?)\s*$/gm) {
my $line = $1;
next if $line =~ /^#/;
next if $handle_comment->($line);
if ($line =~ m/^(\S+?):\s*(.*)$/) {
my $key = $1;
@ -1851,6 +1865,10 @@ sub parse_config {
}
}
if (defined($comment_data)) {
$cfg->{$comment_key} = $comment_data;
}
my $errors = {};
check_prop($cfg, $schema, '', $errors);