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 BD83473F59; Tue, 31 May 2022 13:18:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DAE5B806B; Tue, 31 May 2022 13:17:33 +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 id E69C98046; Tue, 31 May 2022 13:17:27 +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 A77EE43985; Tue, 31 May 2022 13:17:27 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Tue, 31 May 2022 13:17:25 +0200 Message-Id: <20220531111726.2972022-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220531111726.2972022-1-d.csapak@proxmox.com> References: <20220531111726.2972022-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.112 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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: [pve-devel] [PATCH storage 1/1] api/filerestore: add 'tar' parameter to 'download' api 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: Tue, 31 May 2022 11:18:00 -0000 to be able to download 'tar.zst' archives Signed-off-by: Dominik Csapak --- PVE/API2/Storage/FileRestore.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Storage/FileRestore.pm b/PVE/API2/Storage/FileRestore.pm index 5630f52..1c44b3c 100644 --- a/PVE/API2/Storage/FileRestore.pm +++ b/PVE/API2/Storage/FileRestore.pm @@ -156,6 +156,12 @@ __PACKAGE__->register_method ({ description => 'base64-path to the directory or file to download.', type => 'string', }, + tar => { + description => "Download dirs as 'tar.zst' instead of 'zip'.", + type => 'boolean', + optional => 1, + default => 0, + }, }, }, returns => { @@ -171,6 +177,7 @@ __PACKAGE__->register_method ({ my $path = extract_param($param, 'filepath'); my $storeid = extract_param($param, 'storage'); my $volid = $parse_volname_or_id->($storeid, $param->{volume}); + my $tar = extract_param($param, 'tar') // 0; my $cfg = PVE::Storage::config(); my $scfg = PVE::Storage::storage_config($cfg, $storeid); @@ -188,7 +195,7 @@ __PACKAGE__->register_method ({ $rpcenv->fork_worker('pbs-download', undef, $user, sub { my $name = decode_base64($path); print "Starting download of file: $name\n"; - $client->file_restore_extract($fifo, [$scfg->{namespace}, $snap], $path, 1); + $client->file_restore_extract($fifo, [$scfg->{namespace}, $snap], $path, 1, $tar); }); my $ret = { -- 2.30.2 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 BD83473F59; Tue, 31 May 2022 13:18:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DAE5B806B; Tue, 31 May 2022 13:17:33 +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 id E69C98046; Tue, 31 May 2022 13:17:27 +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 A77EE43985; Tue, 31 May 2022 13:17:27 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Tue, 31 May 2022 13:17:25 +0200 Message-Id: <20220531111726.2972022-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220531111726.2972022-1-d.csapak@proxmox.com> References: <20220531111726.2972022-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.112 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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: [pbs-devel] [PATCH storage 1/1] api/filerestore: add 'tar' parameter to 'download' api X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2022 11:18:00 -0000 to be able to download 'tar.zst' archives Signed-off-by: Dominik Csapak --- PVE/API2/Storage/FileRestore.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Storage/FileRestore.pm b/PVE/API2/Storage/FileRestore.pm index 5630f52..1c44b3c 100644 --- a/PVE/API2/Storage/FileRestore.pm +++ b/PVE/API2/Storage/FileRestore.pm @@ -156,6 +156,12 @@ __PACKAGE__->register_method ({ description => 'base64-path to the directory or file to download.', type => 'string', }, + tar => { + description => "Download dirs as 'tar.zst' instead of 'zip'.", + type => 'boolean', + optional => 1, + default => 0, + }, }, }, returns => { @@ -171,6 +177,7 @@ __PACKAGE__->register_method ({ my $path = extract_param($param, 'filepath'); my $storeid = extract_param($param, 'storage'); my $volid = $parse_volname_or_id->($storeid, $param->{volume}); + my $tar = extract_param($param, 'tar') // 0; my $cfg = PVE::Storage::config(); my $scfg = PVE::Storage::storage_config($cfg, $storeid); @@ -188,7 +195,7 @@ __PACKAGE__->register_method ({ $rpcenv->fork_worker('pbs-download', undef, $user, sub { my $name = decode_base64($path); print "Starting download of file: $name\n"; - $client->file_restore_extract($fifo, [$scfg->{namespace}, $snap], $path, 1); + $client->file_restore_extract($fifo, [$scfg->{namespace}, $snap], $path, 1, $tar); }); my $ret = { -- 2.30.2