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 4C4641FF389 for ; Wed, 5 Jun 2024 13:01:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8FE89325B5; Wed, 5 Jun 2024 13:02:02 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 5 Jun 2024 12:53:35 +0200 Message-Id: <20240605105416.278748-18-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240605105416.278748-1-c.ebner@proxmox.com> References: <20240605105416.278748-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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v9 proxmox-backup 17/58] pxar: bin: 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" 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 8: - prefix patch subject with `pxar: bin` instead of `pxar` only - add missing file completion function pxar-bin/src/main.rs | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs index 8108ec0fb..fe5c91c97 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, + }, }, }, )] @@ -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) { @@ -465,7 +488,8 @@ fn main() { .arg_param(&["archive", "target"]) .completion_cb("archive", complete_file_name) .completion_cb("target", complete_file_name) - .completion_cb("files-from", complete_file_name), + .completion_cb("files-from", complete_file_name) + .completion_cb("payload-input", complete_file_name), ) .insert( "mount", -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel