From: Philipp Hufnagl <p.hufnagl@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-storage 1/2] fix #4849: download-url: allow download and decompression of compressed ISOs
Date: Tue, 25 Jul 2023 16:37:18 +0200 [thread overview]
Message-ID: <20230725143720.620577-2-p.hufnagl@proxmox.com> (raw)
In-Reply-To: <20230725143720.620577-1-p.hufnagl@proxmox.com>
Signed-off-by: Philipp Hufnagl <p.hufnagl@proxmox.com>
---
src/PVE/API2/Storage/Status.pm | 20 ++++++++++++++++++--
src/PVE/Storage.pm | 22 ++++++++++++++++++++++
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status.pm
index e4ce698..9ac4660 100644
--- a/src/PVE/API2/Storage/Status.pm
+++ b/src/PVE/API2/Storage/Status.pm
@@ -578,6 +578,11 @@ __PACKAGE__->register_method({
requires => 'checksum-algorithm',
optional => 1,
},
+ compression => {
+ description => "The compression algorithm used to compress",
+ type => 'string',
+ optional => 1,
+ },
'checksum-algorithm' => {
description => "The algorithm to calculate the checksum of the file.",
type => 'string',
@@ -642,14 +647,25 @@ __PACKAGE__->register_method({
http_proxy => $dccfg->{http_proxy},
};
- my ($checksum, $checksum_algorithm) = $param->@{'checksum', 'checksum-algorithm'};
+ my ($checksum, $checksum_algorithm, $compression) = $param->@{'checksum', 'checksum-algorithm', 'compression'};
if ($checksum) {
$opts->{"${checksum_algorithm}sum"} = $checksum;
$opts->{hash_required} = 1;
}
my $worker = sub {
- PVE::Tools::download_file_from_url("$path/$filename", $url, $opts);
+ my $save_to = "$path/$filename";
+ die "refusing to override existing file $save_to \n" if -e $save_to ;
+ $save_to .= ".$compression" if $compression;
+ PVE::Tools::download_file_from_url($save_to, $url, $opts);
+ if($compression)
+ {
+ my $decrypton_error = PVE::Storage::decompress_iso($compression, $save_to);
+ print $decrypton_error if $decrypton_error;
+ unlink $save_to;
+
+
+ }
};
my $worker_id = PVE::Tools::encode_text($filename); # must not pass : or the like as w-ID
diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm
index b99ed35..0c62cc8 100755
--- a/src/PVE/Storage.pm
+++ b/src/PVE/Storage.pm
@@ -1532,6 +1532,11 @@ sub decompressor_info {
lzo => ['lzop', '-d', '-c'],
zst => ['zstd', '-q', '-d', '-c'],
},
+ iso => {
+ gz => ['zstd', '-q', '-d'],
+ zst => ['zstd', '-q', '-d'],
+ lzo => ['lzop', '-q', '-d'],
+ },
};
die "ERROR: archive format not defined\n"
@@ -1611,6 +1616,23 @@ sub archive_auxiliaries_remove {
}
}
+sub decompress_iso
+{
+ my ($compression, $file) = @_;
+
+ my $raw = '';
+ my $out = sub {
+ my $output = shift;
+ $raw .= "$output\n";
+ };
+
+ my $info = decompressor_info('iso', $compression);
+ my $decompressor = $info->{decompressor};
+
+ run_command([@$decompressor, $file], outfunc => $out);
+ return wantarray ? ($raw, undef) : $raw;
+}
+
sub extract_vzdump_config_tar {
my ($archive, $conf_re) = @_;
--
2.39.2
next prev parent reply other threads:[~2023-07-25 14:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-25 14:37 [pve-devel] [PATCH pve-storage/pve-manager 0/3] allow download " Philipp Hufnagl
2023-07-25 14:37 ` Philipp Hufnagl [this message]
2023-07-26 12:31 ` [pve-devel] [PATCH pve-storage 1/2] fix #4849: download-url: allow download and decompression " Fabian Grünbichler
2023-07-25 14:37 ` [pve-devel] [PATCH pve-storage 2/2] clean: fix whitspaces and minor code issues Philipp Hufnagl
2023-07-26 12:31 ` [pve-devel] applied: " Fabian Grünbichler
2023-07-25 14:37 ` [pve-devel] [PATCH pve-manager 1/1] fix #4849: download to storage: automatically detect and configure compression Philipp Hufnagl
2023-07-26 12:31 ` Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230725143720.620577-2-p.hufnagl@proxmox.com \
--to=p.hufnagl@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox