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 009421FF38F for ; Tue, 4 Jun 2024 10:26:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1178AC3D9; Tue, 4 Jun 2024 10:27:09 +0200 (CEST) Date: Tue, 04 Jun 2024 10:26:33 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240528094303.309806-1-c.ebner@proxmox.com> <20240528094303.309806-29-c.ebner@proxmox.com> In-Reply-To: <20240528094303.309806-29-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1717489488.vg276zg1yb.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.059 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: Re: [pbs-devel] [PATCH v8 proxmox-backup 28/69] api: datastore: attach split archive 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" On May 28, 2024 11:42 am, Christian Ebner wrote: > 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 7: > - no changes > > changes since version 6: > - adapt to PxarVariant pxar interface > > src/api2/admin/datastore.rs | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs > index af1c12cc0..bab1104d4 100644 > --- a/src/api2/admin/datastore.rs > +++ b/src/api2/admin/datastore.rs > @@ -1813,7 +1813,16 @@ pub fn pxar_file_download( > let (reader, archive_size) = > get_local_pxar_reader(datastore.clone(), &manifest, &backup_dir, pxar_name)?; > > - let decoder = Accessor::new(pxar::PxarVariant::Unified(reader), archive_size).await?; > + let reader = if let Some(archive_base_name) = pxar_name.strip_suffix(".mpxar.didx") { > + let payload_archive_name = format!("{archive_base_name}.ppxar.didx"); > + let payload_input = > + get_local_pxar_reader(datastore, &manifest, &backup_dir, &payload_archive_name)?; > + pxar::PxarVariant::Split(reader, payload_input) > + } else { > + pxar::PxarVariant::Unified(reader) > + }; > + let decoder = Accessor::new(reader, archive_size).await?; > + some of this is another variant of the get_pxar_archive_names helper, if it lived in pbs-client it could maybe be re-used here? > 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 > > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel