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 C1C647BCC9; Wed, 13 Jul 2022 11:43:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B12A32FA5A; Wed, 13 Jul 2022 11:43:20 +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; Wed, 13 Jul 2022 11:43:19 +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 BBC2E41F6B; Wed, 13 Jul 2022 11:43:18 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com Date: Wed, 13 Jul 2022 11:43:15 +0200 Message-Id: <20220713094317.2423116-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220713094317.2423116-1-d.csapak@proxmox.com> References: <20220713094317.2423116-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.098 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 common v2 1/1] PBSClient: add 'tar' parameter to file_restore_extract 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: Wed, 13 Jul 2022 09:43:50 -0000 so that we can get a 'tar.zst' from proxmox-file-restore by giving '--format tar --zstd' to the file-restore binary Signed-off-by: Dominik Csapak --- src/PVE/PBSClient.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index 37385d7..08e69eb 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -407,7 +407,7 @@ sub file_restore_extract_prepare { # this blocks while data is transfered, call this from a background worker sub file_restore_extract { - my ($self, $output_file, $snapshot, $filepath, $base64) = @_; + my ($self, $output_file, $snapshot, $filepath, $base64, $tar) = @_; (my $namespace, $snapshot) = split_namespaced_parameter($snapshot); @@ -421,10 +421,15 @@ sub file_restore_extract { my $fn = fileno($fh); my $errfunc = sub { print $_[0], "\n"; }; + my $cmd = [ $snapshot, $filepath, "-", "--base64", $base64 ? 1 : 0]; + if ($tar) { + push @$cmd, '--format', 'tar', '--zstd', 1; + } + return run_raw_client_cmd( $self, "extract", - [ $snapshot, $filepath, "-", "--base64", $base64 ? 1 : 0 ], + $cmd, binary => "proxmox-file-restore", namespace => $namespace, errfunc => $errfunc, -- 2.30.2