From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1FD4887D6 for ; Fri, 28 Jul 2023 10:11:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 82C2712DEC for ; Fri, 28 Jul 2023 10:11:49 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 28 Jul 2023 10:11:48 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CE21641DF4 for ; Fri, 28 Jul 2023 10:11:47 +0200 (CEST) Date: Fri, 28 Jul 2023 10:11:38 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20230727152817.775699-1-p.hufnagl@proxmox.com> <20230727152817.775699-2-p.hufnagl@proxmox.com> In-Reply-To: <20230727152817.775699-2-p.hufnagl@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1690530444.e3nmon08p5.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.069 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH V2 common 1/1] fix #4849: download file from url: add opt parameter for a decompression command X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jul 2023 08:11:50 -0000 On July 27, 2023 5:28 pm, Philipp Hufnagl wrote: > Signed-off-by: Philipp Hufnagl > --- > src/PVE/Tools.pm | 9 +++++++++ > 1 file changed, 9 insertions(+) >=20 > diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm > index 9ffac12..d9869e8 100644 > --- a/src/PVE/Tools.pm > +++ b/src/PVE/Tools.pm > @@ -2059,6 +2059,15 @@ sub download_file_from_url { > } > =20 > print "download of '$url' to '$dest' finished\n"; > + > + if ($opts->{decompression_command}) { this is still hard-coding the "file has extensions that is automatically removed by decompression command" assumption, which makes for a difficult interface (what if we add a decompression command that doesn't work like that? why is $dest now no longer the destination file path?) switching to "decompress to stdout" like I suggested in the review of v1 would make the command returned by decompressor_info more flexible, as it can then be included in a pipe (like we do for vma in PVE::QemuServer::restore_vma_archive) or its output redirected to a file. then the whole decompression block can move a bit higher up, before the rename, since $dest will remain the final destination path for both uncompressed and compressed cases. > + my $cmd =3D join(' ', $opts->{decompression_command}->@*, $dest= ); this is wrong - see the rather lengthy comment on top of run_command. the string variant should basically only be used if you have a static command, else use the array or array of arrays variant. PVE::QemuServer::restore_vma_archive has an example, but it's likely more complicated than you need here ;) > + eval{run_command($cmd);}; nit: style ;) > + my $rerr =3D $@; nit: we usually just use $err for this > + unlink $dest; > + die "$rerr\n" if $rerr; > + print "decompressed $dest\n"; > + } > } > =20 > sub get_file_hash { > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20