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 78FB71FF38F for ; Tue, 21 May 2024 15:12:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7A2CA18D73; Tue, 21 May 2024 15:12:29 +0200 (CEST) Message-ID: <9b2fd05b-cbe8-4648-84bb-22856b3c4007@proxmox.com> Date: Tue, 21 May 2024 15:12:25 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox Backup Server development discussion , Christian Ebner References: <20240514103421.289431-1-c.ebner@proxmox.com> <20240514103421.289431-28-c.ebner@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20240514103421.289431-28-c.ebner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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: Re: [pbs-devel] [PATCH v6 proxmox-backup 27/65] 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On 5/14/24 12:33, 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 > --- > 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 505a6883f..c818a49b9 100644 > --- a/src/api2/admin/datastore.rs > +++ b/src/api2/admin/datastore.rs > @@ -1813,7 +1813,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? > + }; > + nit: this could be a bit more readable (IMHO) with 'transpose' (not tested): let payload_input = pxar_name.strip_suffix(".mpxar.didx").map(|archive_base_name| { let payload_archive_name = .... get_local_pxar_reader(....) }).transpose()?; let decoder = Accessor::new(reader, archive_size, payload_input).await?; I generally find it more readable not calling a function twice in the code in such cases, but let only the parameter change > let root = decoder.open_root().await?; > let path = OsStr::from_bytes(file_path).to_os_string(); > let file = root _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel