From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 28F05BC21B for ; Thu, 28 Mar 2024 13:38:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8B34C9F11 for ; Thu, 28 Mar 2024 13:37:44 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 28 Mar 2024 13:37:42 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 393D442947 for ; Thu, 28 Mar 2024 13:37:42 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 28 Mar 2024 13:36:34 +0100 Message-Id: <20240328123707.336951-26-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240328123707.336951-1-c.ebner@proxmox.com> References: <20240328123707.336951-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 v3 proxmox-backup 25/58] restore: cover meta extension for 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: , X-List-Received-Date: Thu, 28 Mar 2024 12:38:19 -0000 Signed-off-by: Christian Ebner --- changes since version 2: - use mpxar and ppxar file extensions - merged with file restore patch into one pbs-client/src/tools/mod.rs | 5 ++++- proxmox-file-restore/src/main.rs | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pbs-client/src/tools/mod.rs b/pbs-client/src/tools/mod.rs index 08986fc5e..f8d3102d1 100644 --- a/pbs-client/src/tools/mod.rs +++ b/pbs-client/src/tools/mod.rs @@ -337,7 +337,10 @@ pub fn complete_pxar_archive_name(arg: &str, param: &HashMap) -> complete_server_file_name(arg, param) .iter() .filter_map(|name| { - if name.ends_with(".pxar.didx") || name.ends_with(".pxar.meta.didx") { + if name.ends_with(".pxar.didx") + || name.ends_with(".mpxar.didx") + || name.ends_with(".ppxar.didx") + { Some(pbs_tools::format::strip_server_file_extension(name).to_owned()) } else { None 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