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 089A61FF38E for ; Tue, 14 May 2024 12:35:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5D4754A36; Tue, 14 May 2024 12:35:25 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 14 May 2024 12:33:40 +0200 Message-Id: <20240514103421.289431-25-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240514103421.289431-1-c.ebner@proxmox.com> References: <20240514103421.289431-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 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: [pbs-devel] [PATCH v6 proxmox-backup 24/65] restore: cover extension for split pxar 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" Cover the additional `.mpxar` for metadata archive and `.ppxar` for the payload data for pxar archives written as split archive. Signed-off-by: Christian Ebner --- proxmox-file-restore/src/main.rs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs index dbab69942..685ce34d9 100644 --- a/proxmox-file-restore/src/main.rs +++ b/proxmox-file-restore/src/main.rs @@ -75,7 +75,10 @@ fn parse_path(path: String, base64: bool) -> Result { (file, path) }; - if file.ends_with(".pxar.didx") { + if file.ends_with(".pxar.didx") + || file.ends_with(".mpxar.didx") + || file.ends_with(".ppxar.didx") + { Ok(ExtractPath::Pxar(file, path)) } else if file.ends_with(".img.fidx") { Ok(ExtractPath::VM(file, path)) @@ -123,11 +126,18 @@ async fn list_files( ExtractPath::ListArchives => { let mut entries = vec![]; for file in manifest.files() { - if !file.filename.ends_with(".pxar.didx") && !file.filename.ends_with(".img.fidx") { + if !file.filename.ends_with(".pxar.didx") + && !file.filename.ends_with(".img.fidx") + && !file.filename.ends_with(".mpxar.didx") + && !file.filename.ends_with(".ppxar.didx") + { continue; } let path = format!("/{}", file.filename); - let attr = if file.filename.ends_with(".pxar.didx") { + let attr = if file.filename.ends_with(".pxar.didx") + || file.filename.ends_with(".mpxar.didx") + || file.filename.ends_with(".ppxar.didx") + { // a pxar file is a file archive, so it's root is also a directory root Some(&DirEntryAttribute::Directory { start: 0 }) } else { -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel