From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id CAF7E1FF38E for ; Tue, 7 May 2024 17:53:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 846F211DFE; Tue, 7 May 2024 17:53:23 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 7 May 2024 17:52:09 +0200 Message-Id: <20240507155244.793819-28-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240507155244.793819-1-c.ebner@proxmox.com> References: <20240507155244.793819-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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 v5 proxmox-backup 27/62] api: datastore: attach optional payload chunk reader 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 chunk reader for pxar archives which have been uploaded using split streams for metadata and payload data. Signed-off-by: Christian Ebner --- changes since version 4: - no changes src/api2/admin/datastore.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 67330dd4f..9e8a06671 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -1814,7 +1814,15 @@ pub fn pxar_file_download( let (reader, archive_size) = get_local_pxar_reader(datastore.clone(), &manifest, &backup_dir, pxar_name)?; - let decoder = Accessor::new(reader, archive_size, None).await?; + let decoder = if let Some(archive_base_name) = pxar_name.strip_suffix(".mpxar.didx") { + let payload_archive_name = format!("{archive_base_name}.ppxar.didx"); + let (payload_reader, payload_size) = + get_local_pxar_reader(datastore, &manifest, &backup_dir, &payload_archive_name)?; + Accessor::new(reader, archive_size, Some((payload_reader, payload_size))).await? + } else { + Accessor::new(reader, archive_size, None).await? + }; + let root = decoder.open_root().await?; let path = OsStr::from_bytes(file_path).to_os_string(); let file = root -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel