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

17
PVE/Storage.pm
View File

@ -12,6 +12,7 @@ use File::Basename;
use File::Path;
use Cwd 'abs_path';
use Socket;
use Time::Local qw(timelocal);
use PVE::Tools qw(run_command file_read_firstline dir_glob_foreach $IPV6RE);
use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_lock_file);
@ -1394,9 +1395,19 @@ sub archive_info {
my $info;
my $volid = basename($archive);
if ($volid =~ /vzdump-(lxc|openvz|qemu)-\d+-.+\.(tgz$|tar|vma)(?:\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))?$/) {
$info = decompressor_info($2, $3);
$info->{type} = $1;
if ($volid =~ /^vzdump-(lxc|openvz|qemu)-\d+-.+\.(tgz$|tar|vma)(?:\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))?$/) {
my ($type, $format, $comp) = ($1, $2, $3);
my $format_re = defined($comp) ? "$format.$comp" : "$format";
$info = decompressor_info($format, $comp);
$info->{type} = $type;
if ($volid =~ /^vzdump-${type}-([1-9][0-9]{2,8})-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.${format_re}$/) {
$info->{vmid} = int($1);
$info->{ctime} = timelocal($7, $6, $5, $4, $3 - 1, $2 - 1900);
$info->{is_std_name} = 1;
} else {
$info->{is_std_name} = 0;
}
} else {
die "ERROR: couldn't determine archive info from '$archive'\n";
}