upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDanConwayDev <DanConwayDev@protonmail.com>2025-08-07 08:41:39 +0100
committerDanConwayDev <DanConwayDev@protonmail.com>2025-08-07 17:25:54 +0100
commitafaa472196059bbfbd41a39b23d8ffb4c28d0805 (patch)
tree50994a45a13a718d41ca56ffbb749f2695540ea4 /src
parentb61ce3469057be9e081ceb01d3a42337ace6a7c4 (diff)
refactor: rename fn `is_grasp_server_in_list`
to make it's purpose clearer
Diffstat (limited to 'src')
-rw-r--r--src/bin/git_remote_nostr/fetch.rs4
-rw-r--r--src/bin/git_remote_nostr/push.rs6
-rw-r--r--src/bin/ngit/sub_commands/send.rs8
-rw-r--r--src/lib/list.rs4
-rw-r--r--src/lib/repo_ref.rs2
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::{
18 }, 18 },
19 git_events::{KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE, tag_value}, 19 git_events::{KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE, tag_value},
20 login::get_curent_user, 20 login::get_curent_user,
21 repo_ref::{RepoRef, is_grasp_server}, 21 repo_ref::{RepoRef, is_grasp_server_in_list},
22 utils::{ 22 utils::{
23 Direction, find_proposal_and_patches_by_branch_name, get_oids_from_fetch_batch, 23 Direction, find_proposal_and_patches_by_branch_name, get_oids_from_fetch_batch,
24 get_open_or_draft_proposals, get_read_protocols_to_try, join_with_and, 24 get_open_or_draft_proposals, get_read_protocols_to_try, join_with_and,
@@ -96,7 +96,7 @@ pub async fn run_fetch(
96 git_server_url, 96 git_server_url,
97 &repo_ref.to_nostr_git_url(&None), 97 &repo_ref.to_nostr_git_url(&None),
98 &term, 98 &term,
99 is_grasp_server(git_server_url, &repo_ref.grasp_servers()), 99 is_grasp_server_in_list(git_server_url, &repo_ref.grasp_servers()),
100 ) { 100 ) {
101 errors.push(error); 101 errors.push(error);
102 } 102 }
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::{
20 list::list_from_remotes, 20 list::list_from_remotes,
21 login::{self, user::UserRef}, 21 login::{self, user::UserRef},
22 push::{push_refs_and_generate_pr_or_pr_update_event, push_to_remote}, 22 push::{push_refs_and_generate_pr_or_pr_update_event, push_to_remote},
23 repo_ref::{self, get_repo_config_from_yaml, is_grasp_server}, 23 repo_ref::{self, get_repo_config_from_yaml, is_grasp_server_in_list},
24 repo_state, 24 repo_state,
25 utils::{ 25 utils::{
26 find_proposal_and_patches_by_branch_name, get_all_proposals, get_remote_name_by_url, 26 find_proposal_and_patches_by_branch_name, get_all_proposals, get_remote_name_by_url,
@@ -153,7 +153,7 @@ pub async fn run_push(
153 &repo_ref.to_nostr_git_url(&None), 153 &repo_ref.to_nostr_git_url(&None),
154 &remote_refspecs, 154 &remote_refspecs,
155 &term, 155 &term,
156 is_grasp_server(&git_server_url, &repo_ref.grasp_servers()), 156 is_grasp_server_in_list(&git_server_url, &repo_ref.grasp_servers()),
157 ); 157 );
158 } 158 }
159 } 159 }
@@ -458,7 +458,7 @@ async fn generate_patches_or_pr_event_or_pr_updates(
458 let repo_grasp_clone_urls: Vec<String> = repo_ref 458 let repo_grasp_clone_urls: Vec<String> = repo_ref
459 .git_server 459 .git_server
460 .iter() 460 .iter()
461 .filter(|s| is_grasp_server(s, &repo_grasps)) 461 .filter(|s| is_grasp_server_in_list(s, &repo_grasps))
462 .cloned() 462 .cloned()
463 .collect(); 463 .collect();
464 464
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::{
13 push::push_refs_and_generate_pr_or_pr_update_event, 13 push::push_refs_and_generate_pr_or_pr_update_event,
14 repo_ref::{ 14 repo_ref::{
15 format_grasp_server_url_as_clone_url, format_grasp_server_url_as_relay_url, 15 format_grasp_server_url_as_clone_url, format_grasp_server_url_as_relay_url,
16 is_grasp_server, normalize_grasp_server_url, 16 is_grasp_server_in_list, normalize_grasp_server_url,
17 }, 17 },
18 utils::proposal_tip_is_pr_or_pr_update, 18 utils::proposal_tip_is_pr_or_pr_update,
19}; 19};
@@ -252,7 +252,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
252 } 252 }
253 // also use repo grasp servers 253 // also use repo grasp servers
254 for url in &repo_ref.git_server { 254 for url in &repo_ref.git_server {
255 if is_grasp_server(url, &repo_grasps) && !to_try.contains(url) { 255 if is_grasp_server_in_list(url, &repo_grasps) && !to_try.contains(url) {
256 to_try.push(url.clone()); 256 to_try.push(url.clone());
257 } 257 }
258 } 258 }
@@ -287,7 +287,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
287 .map(std::string::ToString::to_string) 287 .map(std::string::ToString::to_string)
288 .filter(|g| { 288 .filter(|g| {
289 // is a grasp server not in list of tried 289 // is a grasp server not in list of tried
290 !is_grasp_server(g, &tried) 290 !is_grasp_server_in_list(g, &tried)
291 }) 291 })
292 .collect(); 292 .collect();
293 293
@@ -338,7 +338,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
338 let default_choices: Vec<String> = client 338 let default_choices: Vec<String> = client
339 .get_grasp_default_set() 339 .get_grasp_default_set()
340 .iter() 340 .iter()
341 .filter(|g| !is_grasp_server(g, &tried)) 341 .filter(|g| !is_grasp_server_in_list(g, &tried))
342 .cloned() 342 .cloned()
343 .collect(); 343 .collect();
344 let selections = vec![true; default_choices.len()]; // all selected by default 344 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::{
9 Repo, RepoActions, 9 Repo, RepoActions,
10 nostr_url::{CloneUrl, NostrUrlDecoded, ServerProtocol}, 10 nostr_url::{CloneUrl, NostrUrlDecoded, ServerProtocol},
11 }, 11 },
12 repo_ref::is_grasp_server, 12 repo_ref::is_grasp_server_in_list,
13 utils::{Direction, get_read_protocols_to_try, join_with_and, set_protocol_preference}, 13 utils::{Direction, get_read_protocols_to_try, join_with_and, set_protocol_preference},
14}; 14};
15 15
@@ -23,7 +23,7 @@ pub fn list_from_remotes(
23 let mut remote_states = HashMap::new(); 23 let mut remote_states = HashMap::new();
24 let mut errors = HashMap::new(); 24 let mut errors = HashMap::new();
25 for url in git_servers { 25 for url in git_servers {
26 let is_grasp_server = is_grasp_server(url, grasp_servers); 26 let is_grasp_server = is_grasp_server_in_list(url, grasp_servers);
27 match list_from_remote(term, git_repo, url, decoded_nostr_url, is_grasp_server) { 27 match list_from_remote(term, git_repo, url, decoded_nostr_url, is_grasp_server) {
28 Err(error) => { 28 Err(error) => {
29 errors.insert(url, error); 29 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> {
740} 740}
741 741
742// this should be called is_grasp_server_in_list 742// this should be called is_grasp_server_in_list
743pub fn is_grasp_server(url: &str, grasp_servers: &[String]) -> bool { 743pub fn is_grasp_server_in_list(url: &str, grasp_servers: &[String]) -> bool {
744 if !grasp_servers.is_empty() { 744 if !grasp_servers.is_empty() {
745 if let Ok(url) = normalize_grasp_server_url(url) { 745 if let Ok(url) = normalize_grasp_server_url(url) {
746 grasp_servers.iter().any(|s| { 746 grasp_servers.iter().any(|s| {