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 BC8F91FF2D6 for ; Mon, 22 Jul 2024 12:30:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F409F30639; Mon, 22 Jul 2024 12:31:22 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 22 Jul 2024 12:30:33 +0200 Message-Id: <20240722103034.343303-7-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240722103034.343303-1-c.ebner@proxmox.com> References: <20240722103034.343303-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 v2 proxmox-backup 6/7] client: helper to mimic catalog find using metadata archive 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" Adds helper functions to reimplement the catalog shell functionality for snapshots being encoded as split pxar archives. Just as the `CatalogReader`s find method, recursively iterate entries and call the given callback on all entries matched by the match patterns, starting from the given parent entry. The helper has been split into 2 functions for the async recursion to work. --- changes since version 1: - not present in previous version pbs-client/src/tools/mod.rs | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/pbs-client/src/tools/mod.rs b/pbs-client/src/tools/mod.rs index 10a368fd2..2426c724c 100644 --- a/pbs-client/src/tools/mod.rs +++ b/pbs-client/src/tools/mod.rs @@ -23,6 +23,7 @@ use proxmox_router::cli::{complete_file_name, shellword_split}; use proxmox_schema::*; use proxmox_sys::fs::file_get_json; +use pathpatterns::{MatchList, MatchType}; use pbs_api_types::{Authid, BackupNamespace, RateLimitConfig, UserWithTokens, BACKUP_REPO_URL}; use pbs_datastore::catalog::{ArchiveEntry, CatalogEntryType, DirEntryAttribute}; use pbs_datastore::dynamic_index::{BufferedDynamicReader, LocalDynamicReadAt}; @@ -866,3 +867,42 @@ pub async fn pxar_metadata_catalog_dump_dir( } Ok(()) } + +/// Call the callback on given entry if matched by the match patterns. +fn pxar_metadata_catalog_find_entry<'future, T: Clone + Send + Sync + ReadAt + 'future>( + entry: FileEntry, + match_list: &'future (impl MatchList<'future> + Sync), + callback: &'future (dyn Fn(&[u8]) -> Result<(), Error> + Send + Sync), +) -> Pin> + Send + 'future>> { + Box::pin(async move { + let file_mode = entry.metadata().file_type() as u32; + let entry_path = entry_path_with_prefix(&entry, "/").as_os_str().to_owned(); + + match match_list.matches(entry_path.as_bytes(), file_mode) { + Ok(Some(MatchType::Exclude)) => return Ok(()), + Ok(Some(MatchType::Include)) => callback(entry_path.as_bytes())?, + _ => (), + } + + if let EntryKind::Directory = entry.kind() { + let dir_entry = entry.enter_directory().await?; + pxar_metadata_catalog_find(dir_entry, match_list, callback).await?; + } + + Ok(()) + }) +} + +/// Recursively iterate over pxar archive entries and call the callback on entries matching the +/// match patterns. +pub async fn pxar_metadata_catalog_find<'future, T: Clone + Send + Sync + ReadAt + 'future>( + parent_dir: Directory, + match_list: &'future (impl pathpatterns::MatchList<'future> + Sync), + callback: &'future (dyn Fn(&[u8]) -> Result<(), Error> + Send + Sync), +) -> Result<(), Error> { + let entries = pxar_metadata_read_dir(parent_dir).await?; + for entry in entries { + pxar_metadata_catalog_find_entry(entry, match_list, callback).await?; + } + Ok(()) +} -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel