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 0847B1FF394 for ; Mon, 3 Jun 2024 15:26:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5DAB321C6; Mon, 3 Jun 2024 15:27:10 +0200 (CEST) Date: Mon, 03 Jun 2024 15:27:03 +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-36-c.ebner@proxmox.com> In-Reply-To: <20240528094303.309806-36-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1717421110.27rz65u114.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 35/69] pxar: cover listing for split 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" On May 28, 2024 11:42 am, Christian Ebner wrote: > Allows to list entries of split pxar archives. As the decoder skips > over the file payloads, the corresponding payload file has to be > provided. Otherwise the decoder would skip inside the metadata > archive, leading to incorrect decoding. > > Signed-off-by: Christian Ebner > --- > changes since version 7: > - no changes > > changes since version 6: > - not present in previous version > > pxar-bin/src/main.rs | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > > diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs > index 903467c98..b64ae1d19 100644 > --- a/pxar-bin/src/main.rs > +++ b/pxar-bin/src/main.rs > @@ -454,12 +454,26 @@ async fn mount_archive(archive: String, mountpoint: String, verbose: bool) -> Re > archive: { > description: "Archive name.", > }, > + "payload-input": { > + description: "'ppxar' payload input data file for split archive.", > + optional: true, > + }, nit: this one is also missing completion and I guess mount is missing split support entirely? technically, we could also add it for the create part (without caching logic of course).. > }, > }, > )] > /// List the contents of an archive. > -fn dump_archive(archive: String) -> Result<(), Error> { > - for entry in pxar::decoder::Decoder::open(archive)? { > +fn dump_archive(archive: String, payload_input: Option) -> Result<(), Error> { > + if archive.ends_with(".mpxar") && payload_input.is_none() { > + bail!("Payload input required for split pxar archives"); > + } > + > + let input = if let Some(payload_input) = payload_input { > + pxar::PxarVariant::Split(archive, payload_input) > + } else { > + pxar::PxarVariant::Unified(archive) > + }; > + > + for entry in pxar::decoder::Decoder::open(input)? { > let entry = entry?; > > if log::log_enabled!(log::Level::Debug) { > -- > 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