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

Expand archive_info to include ctime, vmid and is_std_name

Browse Source 
where 'is_std_name' shows whether the backup name uses the standard naming
schema and most likely was created by our tools.

Also adds a '^' to the existing filename matching regex, which
should be fine since basename() is used beforehand.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner
2020-06-04 11:08:34 +02:00
committed by Thomas Lamprecht
parent ddf7fdaa82
commit fb821c1828
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PVE/Storage/Plugin.pm
View File

@ -8,7 +8,6 @@ use File::chdir;
use File::Path;
use File::Basename;
use File::stat qw();
use Time::Local qw(timelocal);
use PVE::Tools qw(run_command);
use PVE::JSONSchema qw(get_standard_option);
@ -942,21 +941,19 @@ my $get_subdir_files = sub {
} elsif ($tt eq 'backup') {
next if defined($vmid) && $fn !~ m/\S+-$vmid-\S+/;
next if $fn !~ m!/([^/]+\.(tgz|(?:(?:tar|vma)(?:\.(${\COMPRESSOR_RE}))?)))$!;
my $format = $2;
$fn = $1;
$info = { volid => "$sid:backup/$fn", format => $format };
if ($fn =~ m!^vzdump\-(?:lxc|qemu)\-(?:[1-9][0-9]{2,8})\-(\d{4})_(\d{2})_(\d{2})\-(\d{2})_(\d{2})_(\d{2})\.${format}$!) {
my $epoch = timelocal($6, $5, $4, $3, $2-1, $1 - 1900);
$info->{ctime} = $epoch;
}
my $archive_info = eval { PVE::Storage::archive_info($fn) };
$info->{ctime} = $archive_info->{ctime}
if defined($archive_info) && defined($archive_info->{ctime});
if (defined($vmid) || $fn =~ m!\-([1-9][0-9]{2,8})\-[^/]+\.${format}$!) {
$info->{vmid} = $vmid // $1;
}
} elsif ($tt eq 'snippets') {
$info = {