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 58F071FF394 for ; Mon, 3 Jun 2024 15:23:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F25292179; Mon, 3 Jun 2024 15:23:41 +0200 (CEST) Date: Mon, 03 Jun 2024 15:23:04 +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-35-c.ebner@proxmox.com> In-Reply-To: <20240528094303.309806-35-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1717420938.saxxr2wua9.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 34/69] pxar: add optional payload input for archive restore 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 pass the optional payload input to restore for cases where the > regular file payloads are stored in the split archive. > > Signed-off-by: Christian Ebner > --- > changes since version 7: > - no changes > > changes since version 6: > - adapt to PxarVariant pxar interface > > pxar-bin/src/main.rs | 29 ++++++++++++++++++++++++++--- > 1 file changed, 26 insertions(+), 3 deletions(-) > > diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs > index 61756d21c..903467c98 100644 > --- a/pxar-bin/src/main.rs > +++ b/pxar-bin/src/main.rs > @@ -25,9 +25,15 @@ fn extract_archive_from_reader( > target: &str, > feature_flags: Flags, > options: PxarExtractOptions, > + payload_reader: Option<&mut R>, > ) -> Result<(), Error> { > + let reader = if let Some(payload_reader) = payload_reader { > + pxar::PxarVariant::Split(reader, payload_reader) > + } else { > + pxar::PxarVariant::Unified(reader) > + }; > pbs_client::pxar::extract_archive( > - pxar::decoder::Decoder::from_std(pxar::PxarVariant::Unified(reader))?, > + pxar::decoder::Decoder::from_std(reader)?, > Path::new(target), > feature_flags, > |path| { > @@ -120,6 +126,10 @@ fn extract_archive_from_reader( > optional: true, > default: false, > }, > + "payload-input": { > + description: "'ppxar' payload input data file to restore split archive.", > + optional: true, > + }, nit: this is missing completion > }, > }, > )] > @@ -142,6 +152,7 @@ fn extract_archive( > no_fifos: bool, > no_sockets: bool, > strict: bool, > + payload_input: Option, > ) -> Result<(), Error> { > let mut feature_flags = Flags::DEFAULT; > if no_xattrs { > @@ -220,12 +231,24 @@ fn extract_archive( > if archive == "-" { > let stdin = std::io::stdin(); > let mut reader = stdin.lock(); > - extract_archive_from_reader(&mut reader, target, feature_flags, options)?; > + extract_archive_from_reader(&mut reader, target, feature_flags, options, None)?; > } else { > log::debug!("PXAR extract: {}", archive); > let file = std::fs::File::open(archive)?; > let mut reader = std::io::BufReader::new(file); > - extract_archive_from_reader(&mut reader, target, feature_flags, options)?; > + let mut payload_reader = if let Some(payload_input) = payload_input { > + let file = std::fs::File::open(payload_input)?; > + Some(std::io::BufReader::new(file)) > + } else { > + None > + }; > + extract_archive_from_reader( > + &mut reader, > + target, > + feature_flags, > + options, > + payload_reader.as_mut(), > + )?; > } > > if !was_ok.load(Ordering::Acquire) { > -- > 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