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 7CFE61FF15C for ; Fri, 17 Oct 2025 16:12:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E098452D1; Fri, 17 Oct 2025 16:12:28 +0200 (CEST) From: Christian Ebner To: pdm-devel@lists.proxmox.com Date: Fri, 17 Oct 2025 16:11:31 +0200 Message-ID: <20251017141137.845295-6-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251017141137.845295-1-c.ebner@proxmox.com> References: <20251017141137.845295-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760710311158 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.042 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: [pdm-devel] [PATCH datacenter-manager v2 05/11] server: api: add remote-type search category for resources X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" Extend the current search capability for resources by adding the `RemoteType` search category, allowing to selectively filter remotes of type PVE and PBS. Since the current remote filtering is only applied in case of remotes only search, add an additional helper to pre-filter the to be fetched resources by the remote type. With this it is now possible to search, e.g. `remote-type:pbs` to only get resources from PBS remotes, with the intention to provide a search shortcut to show PBS remotes when clicking in the to be added PBS status dashboard panel. Signed-off-by: Christian Ebner --- changes since version 1: - Pass &Remote instead of remote type only to remote filter match logic - Adapt to new refactored code server/src/api/resources.rs | 39 ++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/server/src/api/resources.rs b/server/src/api/resources.rs index 793db5e..b3f3ba2 100644 --- a/server/src/api/resources.rs +++ b/server/src/api/resources.rs @@ -56,6 +56,7 @@ enum MatchCategory { Status, Template, Remote, + RemoteType, } impl std::str::FromStr for MatchCategory { @@ -69,6 +70,7 @@ impl std::str::FromStr for MatchCategory { "status" => MatchCategory::Status, "template" => MatchCategory::Template, "remote" => MatchCategory::Remote, + "remote-type" => MatchCategory::RemoteType, _ => bail!("invalid category"), }; Ok(category) @@ -88,11 +90,18 @@ impl MatchCategory { (Ok(a), Ok(b)) => a == b, _ => false, }, + MatchCategory::RemoteType => match ( + RemoteType::from_str(value), + RemoteType::from_str(search_term), + ) { + (Ok(a), Ok(b)) => a == b, + _ => false, + }, } } } -// returns None if we can't decide if it matches, currently only for the `Remote` category` +// returns None if we can't decide if it matches, currently only for the `RemoteType` category fn resource_matches_search_term( remote_name: &str, resource: &Resource, @@ -112,6 +121,7 @@ fn resource_matches_search_term( _ => false, }, MatchCategory::Remote => category.matches(remote_name, &term.value), + MatchCategory::RemoteType => return None, }, Some(Err(_)) => false, None => { @@ -122,7 +132,12 @@ fn resource_matches_search_term( Some(matches) } -fn remote_matches_search_term(remote_name: &str, online: Option, term: &SearchTerm) -> bool { +fn remote_matches_search_term( + remote_name: &str, + remote: &Remote, + online: Option, + term: &SearchTerm, +) -> bool { match term.category.as_deref().map(|c| c.parse::()) { Some(Ok(category)) => match category { MatchCategory::Type => category.matches("remote", &term.value), @@ -135,6 +150,7 @@ fn remote_matches_search_term(remote_name: &str, online: Option, term: &Se None => true, }, MatchCategory::Template => false, + MatchCategory::RemoteType => category.matches(&remote.ty.to_string(), &term.value), }, Some(Err(_)) => false, None => { @@ -144,6 +160,17 @@ fn remote_matches_search_term(remote_name: &str, online: Option, term: &Se } } +fn remote_type_matches_search_term(remote_type: RemoteType, term: &SearchTerm) -> bool { + match term.category.as_deref().map(|c| c.parse::()) { + Some(Ok(category)) => match category { + MatchCategory::RemoteType => category.matches(&remote_type.to_string(), &term.value), + _ => true, + }, + Some(Err(_)) => false, + None => true, + } +} + // Transient type for remote resources gathering and filtering on remote properties pub(crate) struct RemoteWithResources { remote_name: String, @@ -269,8 +296,13 @@ pub(crate) async fn get_resources_impl( } } + if !filters.matches(|term| remote_type_matches_search_term(remote.ty, term)) { + continue; + } + if remotes_only - && !filters.matches(|term| remote_matches_search_term(&remote_name, None, term)) + && !filters + .matches(|term| remote_matches_search_term(&remote_name, &remote, None, term)) { continue; } @@ -323,6 +355,7 @@ pub(crate) async fn get_resources_impl( } else if filters.matches(|filter| { remote_matches_search_term( &remote_with_resources.remote_name, + &remote_with_resources.remote, Some(remote_with_resources.error.is_none()), filter, ) -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel