From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 9052C1FF399 for ; Wed, 5 Jun 2024 12:54:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AB0C631CC7; Wed, 5 Jun 2024 12:55:05 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 5 Jun 2024 12:53:23 +0200 Message-Id: <20240605105416.278748-6-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 05/58] 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 an archive name as input and checks if the given archive is present in the manifest, by also taking possible split archive extensions into account. Returns the pxar archive name if found or the split archive names if the split archive variant is present in the manifest. If neither is matched, an error is returned signaling that nothing matched entries in the manifest. Signed-off-by: Christian Ebner --- changes since version 8: - move method to pbs-client's tools, so it can be reused from within crate - lookup archive name in manifest, return with error if not present pbs-client/src/tools/mod.rs | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/pbs-client/src/tools/mod.rs b/pbs-client/src/tools/mod.rs index 1b0123a39..fdce33914 100644 --- a/pbs-client/src/tools/mod.rs +++ b/pbs-client/src/tools/mod.rs @@ -16,6 +16,7 @@ use proxmox_schema::*; use proxmox_sys::fs::file_get_json; use pbs_api_types::{Authid, BackupNamespace, RateLimitConfig, UserWithTokens, BACKUP_REPO_URL}; +use pbs_datastore::BackupManifest; use crate::{BackupRepository, HttpClient, HttpClientOptions}; @@ -526,3 +527,52 @@ pub fn place_xdg_file( .and_then(|base| base.place_config_file(file_name).map_err(Error::from)) .with_context(|| format!("failed to place {} in xdg home", description)) } + +pub fn get_pxar_archive_names( + archive_name: &str, + manifest: &BackupManifest, +) -> Result<(String, Option), Error> { + let filename = archive_name.strip_suffix(".didx").unwrap_or(archive_name); + + // Check if archive with given extension is present, otherwise fallback to split archive naming + if manifest + .files() + .iter() + .any(|fileinfo| fileinfo.filename == format!("{filename}.didx")) + { + // check if already given as one of split archive name variants + if let Some(base) = filename + .strip_suffix(".mpxar") + .or_else(|| filename.strip_suffix(".ppxar")) + { + if archive_name.ends_with(".didx") { + return Ok(( + format!("{base}.mpxar.didx"), + Some(format!("{base}.ppxar.didx")), + )); + } + return Ok((format!("{base}.mpxar"), Some(format!("{base}.ppxar")))); + } + return Ok((archive_name.to_owned(), None)); + } + + if let Some(base) = filename.strip_suffix(".pxar") { + let filename = format!("{base}.mpxar"); + // check if present with split archive name variant + if manifest + .files() + .iter() + .any(|fileinfo| fileinfo.filename == format!("{filename}.didx")) + { + if archive_name.ends_with(".didx") { + return Ok(( + format!("{base}.mpxar.didx"), + Some(format!("{base}.ppxar.didx")), + )); + } + return Ok((format!("{base}.mpxar"), Some(format!("{base}.ppxar")))); + } + } + + bail!("archive not found in manifest"); +} -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel