From afaa472196059bbfbd41a39b23d8ffb4c28d0805 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Thu, 7 Aug 2025 08:41:39 +0100 Subject: refactor: rename fn `is_grasp_server_in_list` to make it's purpose clearer --- src/bin/git_remote_nostr/fetch.rs | 4 ++-- src/bin/git_remote_nostr/push.rs | 6 +++--- src/bin/ngit/sub_commands/send.rs | 8 ++++---- src/lib/list.rs | 4 ++-- src/lib/repo_ref.rs | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bin/git_remote_nostr/fetch.rs b/src/bin/git_remote_nostr/fetch.rs index 221d964..2cc87da 100644 --- a/src/bin/git_remote_nostr/fetch.rs +++ b/src/bin/git_remote_nostr/fetch.rs @@ -18,7 +18,7 @@ use ngit::{ }, git_events::{KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE, tag_value}, login::get_curent_user, - repo_ref::{RepoRef, is_grasp_server}, + repo_ref::{RepoRef, is_grasp_server_in_list}, utils::{ Direction, find_proposal_and_patches_by_branch_name, get_oids_from_fetch_batch, get_open_or_draft_proposals, get_read_protocols_to_try, join_with_and, @@ -96,7 +96,7 @@ pub async fn run_fetch( git_server_url, &repo_ref.to_nostr_git_url(&None), &term, - is_grasp_server(git_server_url, &repo_ref.grasp_servers()), + is_grasp_server_in_list(git_server_url, &repo_ref.grasp_servers()), ) { errors.push(error); } diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs index f98e792..d42c904 100644 --- a/src/bin/git_remote_nostr/push.rs +++ b/src/bin/git_remote_nostr/push.rs @@ -20,7 +20,7 @@ use ngit::{ list::list_from_remotes, login::{self, user::UserRef}, push::{push_refs_and_generate_pr_or_pr_update_event, push_to_remote}, - repo_ref::{self, get_repo_config_from_yaml, is_grasp_server}, + repo_ref::{self, get_repo_config_from_yaml, is_grasp_server_in_list}, repo_state, utils::{ find_proposal_and_patches_by_branch_name, get_all_proposals, get_remote_name_by_url, @@ -153,7 +153,7 @@ pub async fn run_push( &repo_ref.to_nostr_git_url(&None), &remote_refspecs, &term, - is_grasp_server(&git_server_url, &repo_ref.grasp_servers()), + is_grasp_server_in_list(&git_server_url, &repo_ref.grasp_servers()), ); } } @@ -458,7 +458,7 @@ async fn generate_patches_or_pr_event_or_pr_updates( let repo_grasp_clone_urls: Vec = repo_ref .git_server .iter() - .filter(|s| is_grasp_server(s, &repo_grasps)) + .filter(|s| is_grasp_server_in_list(s, &repo_grasps)) .cloned() .collect(); diff --git a/src/bin/ngit/sub_commands/send.rs b/src/bin/ngit/sub_commands/send.rs index fa2b64d..05054fd 100644 --- a/src/bin/ngit/sub_commands/send.rs +++ b/src/bin/ngit/sub_commands/send.rs @@ -13,7 +13,7 @@ use ngit::{ push::push_refs_and_generate_pr_or_pr_update_event, repo_ref::{ format_grasp_server_url_as_clone_url, format_grasp_server_url_as_relay_url, - is_grasp_server, normalize_grasp_server_url, + is_grasp_server_in_list, normalize_grasp_server_url, }, utils::proposal_tip_is_pr_or_pr_update, }; @@ -252,7 +252,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re } // also use repo grasp servers for url in &repo_ref.git_server { - if is_grasp_server(url, &repo_grasps) && !to_try.contains(url) { + if is_grasp_server_in_list(url, &repo_grasps) && !to_try.contains(url) { to_try.push(url.clone()); } } @@ -287,7 +287,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re .map(std::string::ToString::to_string) .filter(|g| { // is a grasp server not in list of tried - !is_grasp_server(g, &tried) + !is_grasp_server_in_list(g, &tried) }) .collect(); @@ -338,7 +338,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re let default_choices: Vec = client .get_grasp_default_set() .iter() - .filter(|g| !is_grasp_server(g, &tried)) + .filter(|g| !is_grasp_server_in_list(g, &tried)) .cloned() .collect(); let selections = vec![true; default_choices.len()]; // all selected by default diff --git a/src/lib/list.rs b/src/lib/list.rs index b940546..b867858 100644 --- a/src/lib/list.rs +++ b/src/lib/list.rs @@ -9,7 +9,7 @@ use crate::{ Repo, RepoActions, nostr_url::{CloneUrl, NostrUrlDecoded, ServerProtocol}, }, - repo_ref::is_grasp_server, + repo_ref::is_grasp_server_in_list, utils::{Direction, get_read_protocols_to_try, join_with_and, set_protocol_preference}, }; @@ -23,7 +23,7 @@ pub fn list_from_remotes( let mut remote_states = HashMap::new(); let mut errors = HashMap::new(); for url in git_servers { - let is_grasp_server = is_grasp_server(url, grasp_servers); + let is_grasp_server = is_grasp_server_in_list(url, grasp_servers); match list_from_remote(term, git_repo, url, decoded_nostr_url, is_grasp_server) { Err(error) => { errors.insert(url, error); diff --git a/src/lib/repo_ref.rs b/src/lib/repo_ref.rs index e3f71a1..5e857e9 100644 --- a/src/lib/repo_ref.rs +++ b/src/lib/repo_ref.rs @@ -740,7 +740,7 @@ pub fn extract_npub(s: &str) -> Result<&str> { } // this should be called is_grasp_server_in_list -pub fn is_grasp_server(url: &str, grasp_servers: &[String]) -> bool { +pub fn is_grasp_server_in_list(url: &str, grasp_servers: &[String]) -> bool { if !grasp_servers.is_empty() { if let Ok(url) = normalize_grasp_server_url(url) { grasp_servers.iter().any(|s| { -- cgit v1.2.3