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 5B2D21FF3A8 for ; Mon, 27 May 2024 16:33:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 051AB4FAB; Mon, 27 May 2024 16:33:56 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 27 May 2024 16:32:36 +0200 Message-Id: <20240527143323.456002-23-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240527143323.456002-1-c.ebner@proxmox.com> References: <20240527143323.456002-1-c.ebner@proxmox.com> MIME-Version: 1.0 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v7 proxmox-backup 22/69] client: helper: add method for split archive name mapping 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" Helper method that takes the meta or payload archive name as input and maps it to the correct archive names for metadata and payload archive. If neither is matched, fallback to returning the passed in archive name as target archive and `None` for the payload archive name. Signed-off-by: Christian Ebner --- changes since version 6: - extend mapping to also include `.pxar` as allowed extension, mapping to `.mpxar` proxmox-backup-client/src/helper.rs | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/proxmox-backup-client/src/helper.rs b/proxmox-backup-client/src/helper.rs index 5b21b6720..5589aa5b1 100644 --- a/proxmox-backup-client/src/helper.rs +++ b/proxmox-backup-client/src/helper.rs @@ -70,3 +70,45 @@ pub(crate) async fn get_buffered_pxar_reader( Ok(BufferedDynamicReader::new(index, chunk_reader)) } + +pub(crate) fn get_pxar_archive_names( + archive_name: &str, + manifest: &BackupManifest, +) -> (String, Option) { + let filename = archive_name.strip_suffix(".didx").unwrap_or(archive_name); + + if let Some(base) = filename + .strip_suffix(".mpxar") + .or_else(|| filename.strip_suffix(".ppxar")) + { + if archive_name.ends_with(".didx") { + return ( + format!("{base}.mpxar.didx"), + Some(format!("{base}.ppxar.didx")), + ); + } else { + return (format!("{base}.mpxar"), Some(format!("{base}.ppxar"))); + } + } + + if let Some(base) = filename.strip_suffix(".pxar") { + // Check if pxar is present, otherwise fallback to split archive naming + if manifest + .files() + .iter() + .find(|fileinfo| fileinfo.filename == filename) + .is_none() + { + if archive_name.ends_with(".didx") { + return ( + format!("{base}.mpxar.didx"), + Some(format!("{base}.ppxar.didx")), + ); + } else { + return (format!("{base}.mpxar"), Some(format!("{base}.ppxar"))); + } + } + } + + (archive_name.to_owned(), None) +} -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel