[pve-devel] [PATCH V2 common 1/1] fix #4849: download file from url: add opt parameter for a decompression command

[Fabian Grünbichler]

On July 27, 2023 5:28 pm, Philipp Hufnagl wrote:
> Signed-off-by: Philipp Hufnagl <p.hufnagl at proxmox.com>
> ---
>  src/PVE/Tools.pm | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> 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 {
>      }
>  
>      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 = 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 = $@;

nit: we usually just use $err for this

> +        unlink $dest;
> +        die "$rerr\n" if $rerr;
> +        print "decompressed $dest\n";
> +    }
>  }
>  
>  sub get_file_hash {
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
>