[pve-devel] [PATCH v3 manager 11/13] make use of archive_info and archive_remove

[Fabian Ebner]

to avoid some code duplication.

Signed-off-by: Fabian Ebner <f.eb...@proxmox.com>
---
 PVE/VZDump.pm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index b1107eac..e8669665 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -631,10 +631,15 @@ sub get_backup_file_list {
     my $bklist = [];
     foreach my $fn (<$dir/${bkname}-*>) {
        next if $exclude_fn && $fn eq $exclude_fn;
-       if ($fn =~ 
m!/(${bkname}-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|((tar|vma)(\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))?)))$!)
 {
-           $fn = "$dir/$1"; # untaint
-           my $t = timelocal ($7, $6, $5, $4, $3 - 1, $2);
-           push @$bklist, [$fn, $t];
+
+       my $archive_info = eval { PVE::Storage::archive_info($fn) } // {};
+       if ($archive_info->{is_std_name}) {
+           my $filename = $archive_info->{filename};
+           my $backup = {
+               'path' => "$dir/$filename",
+               'ctime' => $archive_info->{ctime},
+           };
+           push @{$bklist}, $backup;
        }
     }
 
@@ -932,15 +937,13 @@ sub exec_backup_task {
                    $opts->{scfg}, $opts->{storage}, 'prune', $args, logfunc => 
$logfunc);
            } else {
                my $bklist = get_backup_file_list($opts->{dumpdir}, $bkname, 
$task->{tarfile});
-               $bklist = [ sort { $b->[1] <=> $a->[1] } @$bklist ];
+               $bklist = [ sort { $b->{ctime} <=> $a->{ctime} } @$bklist ];
 
                while (scalar (@$bklist) >= $maxfiles) {
                    my $d = pop @$bklist;
-                   debugmsg ('info', "delete old backup '$d->[0]'", $logfd);
-                   unlink $d->[0];
-                   my $logfn = $d->[0];
-                   $logfn =~ 
s/\.(tgz|((tar|vma)(\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))?))$/\.log/;
-                   unlink $logfn;
+                   my $archive_path = $d->{path};
+                   debugmsg ('info', "delete old backup '$archive_path'", 
$logfd);
+                   PVE::Storage::archive_remove($archive_path);
                }
            }
        }
-- 
2.20.1


_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel