yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

storage: get subdirectory files: read .comment files for comments

Browse Source 
we have no way of setting them yet via the API, but we can read them
now

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2020-11-12 16:26:02 +01:00
committed by Thomas Lamprecht
parent 9778e5c216
commit d260b9f357
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
PVE/Storage/Plugin.pm
View File

@ -19,6 +19,8 @@ use base qw(PVE::SectionConfig);
use constant COMPRESSOR_RE => 'gz|lzo|zst'; use constant COMPRESSOR_RE => 'gz|lzo|zst';
use constant COMMENT_EXT => ".comment";
our @COMMON_TAR_FLAGS = qw( our @COMMON_TAR_FLAGS = qw(
--one-file-system --one-file-system
-p --sparse --numeric-owner --acls -p --sparse --numeric-owner --acls
@ -987,8 +989,18 @@ my $get_subdir_files = sub {
my $res = []; my $res = [];
my $has_comment = {};
foreach my $fn (<$path/*>) { foreach my $fn (<$path/*>) {
if (COMMENT_EXT eq substr($fn, -length(COMMENT_EXT))) {
my $real_fn = substr($fn, 0, length($fn) - length(COMMENT_EXT));
if (!defined($has_comment->{$real_fn})) {
$has_comment->{$real_fn} = (-f $fn);
}
next; # we do not need to do anything with comments themselves
}
my $st = File::stat::stat($fn); my $st = File::stat::stat($fn);
next if (!$st || S_ISDIR($st->mode)); next if (!$st || S_ISDIR($st->mode));
@ -1008,6 +1020,7 @@ my $get_subdir_files = sub {
} elsif ($tt eq 'backup') { } elsif ($tt eq 'backup') {
next if defined($vmid) && $fn !~ m/\S+-$vmid-\S+/; next if defined($vmid) && $fn !~ m/\S+-$vmid-\S+/;
next if $fn !~ m!/([^/]+\.(tgz|(?:(?:tar|vma)(?:\.(${\COMPRESSOR_RE}))?)))$!; next if $fn !~ m!/([^/]+\.(tgz|(?:(?:tar|vma)(?:\.(${\COMPRESSOR_RE}))?)))$!;
my $original = $fn;
my $format = $2; my $format = $2;
$fn = $1; $fn = $1;
$info = { volid => "$sid:backup/$fn", format => $format }; $info = { volid => "$sid:backup/$fn", format => $format };
@ -1020,6 +1033,16 @@ my $get_subdir_files = sub {
$info->{vmid} = $vmid // $1; $info->{vmid} = $vmid // $1;
} }
my $comment_fn = $original.COMMENT_EXT;
if (!defined($has_comment->{$original})) {
$has_comment->{$original} = (-f $comment_fn);
}
if ($has_comment->{$original}) {
my $comment = PVE::Tools::file_read_firstline($comment_fn);
$info->{comment} = $comment if defined($comment);
}
} elsif ($tt eq 'snippets') { } elsif ($tt eq 'snippets') {
$info = { $info = {