proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-07 20:13:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

restore: replace archive format/compression

Browse Source 
regex to reduce the code duplication, as archive_info and
decompressor_info provides the same information as well.

Signed-off-by: Alwin Antreich <a.antreich@proxmox.com>
This commit is contained in:
Alwin Antreich 2020-04-28 15:58:12 +02:00 committed by Fabian Grünbichler
parent cb521f2d88
commit c6d517835a
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
PVE/QemuServer.pm
View File

@ -5637,28 +5637,9 @@ sub tar_restore_cleanup {
sub restore_file_archive { sub restore_file_archive {
my ($archive, $vmid, $user, $opts) = @_; my ($archive, $vmid, $user, $opts) = @_;
my $format = $opts->{format}; my $info = PVE::Storage::archive_info($archive);
my $comp; my $format = $opts->{format} // $info->{format};
my $comp = $info->{compression};
if ($archive =~ m/\.tgz$/ || $archive =~ m/\.tar\.gz$/) {
$format = 'tar' if !$format;
$comp = 'gzip';
} elsif ($archive =~ m/\.tar$/) {
$format = 'tar' if !$format;
} elsif ($archive =~ m/.tar.lzo$/) {
$format = 'tar' if !$format;
$comp = 'lzop';
} elsif ($archive =~ m/\.vma$/) {
$format = 'vma' if !$format;
} elsif ($archive =~ m/\.vma\.gz$/) {
$format = 'vma' if !$format;
$comp = 'gzip';
} elsif ($archive =~ m/\.vma\.lzo$/) {
$format = 'vma' if !$format;
$comp = 'lzop';
} else {
$format = 'vma' if !$format; # default
}
# try to detect archive format # try to detect archive format
if ($format eq 'tar') { if ($format eq 'tar') {
@ -6246,14 +6227,9 @@ sub restore_vma_archive {
} }
if ($comp) { if ($comp) {
my $cmd; my $info = PVE::Storage::decompressor_info('vma', $comp);
if ($comp eq 'gzip') { my $cmd = $info->{decompressor};
$cmd = ['zcat', $readfrom]; push @$cmd, $readfrom;
} elsif ($comp eq 'lzop') {
$cmd = ['lzop', '-d', '-c', $readfrom];
} else {
die "unknown compression method '$comp'\n";
}
$add_pipe->($cmd); $add_pipe->($cmd);
} }