From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 7FB5E20EC94 for ; Mon, 29 Apr 2024 14:12:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D6FB0FCFB; Mon, 29 Apr 2024 14:12:07 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 29 Apr 2024 14:10:35 +0200 Message-Id: <20240429121102.315059-32-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240429121102.315059-1-c.ebner@proxmox.com> References: <20240429121102.315059-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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 Subject: [pbs-devel] [PATCH v4 proxmox-backup 31/58] file restore: cover split metadata and payload archives 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Attach the payload data archive as input stream to the decoder and accessor instances for split archives. Allows to restore contents from split archives via the `proxmox-file-restore extract` command, by passing the metadata archive name. Signed-off-by: Christian Ebner --- proxmox-file-restore/src/main.rs | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs index 8a11cff65..36a988708 100644 --- a/proxmox-file-restore/src/main.rs +++ b/proxmox-file-restore/src/main.rs @@ -477,9 +477,25 @@ async fn extract( match path { ExtractPath::Pxar(archive_name, path) => { - let (reader, archive_size) = - get_local_pxar_reader(&archive_name, client, &manifest, crypt_config).await?; - let decoder = Accessor::new(reader, archive_size, None).await?; + let (reader, archive_size) = get_local_pxar_reader( + &archive_name, + client.clone(), + &manifest, + crypt_config.clone(), + ) + .await?; + + let decoder = if let Some(archive_base_name) = archive_name.strip_suffix(".mpxar.didx") + { + let payload_archive_name = format!("{archive_base_name}.ppxar.didx"); + let (payload_reader, payload_size) = + get_local_pxar_reader(&payload_archive_name, client, &manifest, crypt_config) + .await?; + Accessor::new(reader, archive_size, Some((payload_reader, payload_size))).await? + } else { + Accessor::new(reader, archive_size, None).await? + }; + extract_to_target(decoder, &path, target, format, zstd).await?; } ExtractPath::VM(file, path) => { -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel