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 5A9951FF38E for ; Tue, 28 May 2024 11:43:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2793712227; Tue, 28 May 2024 11:43:41 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 28 May 2024 11:42:26 +0200 Message-Id: <20240528094303.309806-33-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240528094303.309806-1-c.ebner@proxmox.com> References: <20240528094303.309806-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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v8 proxmox-backup 32/69] 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 --- changes since version 7: - no changes changes since version 6: - s/get_local_pxar_reader/get_remote_pxar_reader - adapt to PxarVariant pxar interface 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 c9a545677..0de2b47e6 100644 --- a/proxmox-file-restore/src/main.rs +++ b/proxmox-file-restore/src/main.rs @@ -470,9 +470,25 @@ async fn extract( match path { ExtractPath::Pxar(archive_name, path) => { - let (reader, archive_size) = - get_remote_pxar_reader(&archive_name, client, &manifest, crypt_config).await?; - let decoder = Accessor::new(pxar::PxarVariant::Unified(reader), archive_size).await?; + let (reader, archive_size) = get_remote_pxar_reader( + &archive_name, + client.clone(), + &manifest, + crypt_config.clone(), + ) + .await?; + + let reader = 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_remote_pxar_reader(&payload_archive_name, client, &manifest, crypt_config) + .await?; + pxar::PxarVariant::Split(reader, (payload_reader, payload_size)) + } else { + pxar::PxarVariant::Unified(reader) + }; + let decoder = Accessor::new(reader, archive_size).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