From d1a6d62e895acd329cb6bae51eb88eb9f290b0a4 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Thu, 19 Jun 2025 16:38:58 +0100 Subject: refactor: rename ngit_relay to grasp in function, params and variable names --- src/bin/git_remote_nostr/fetch.rs | 8 ++++---- src/bin/git_remote_nostr/list.rs | 24 ++++++++++++------------ src/bin/git_remote_nostr/push.rs | 24 ++++++++++++------------ src/bin/git_remote_nostr/utils.rs | 8 ++++---- 4 files changed, 32 insertions(+), 32 deletions(-) (limited to 'src/bin/git_remote_nostr') diff --git a/src/bin/git_remote_nostr/fetch.rs b/src/bin/git_remote_nostr/fetch.rs index adc68b3..b191850 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::tag_value, login::get_curent_user, - repo_ref::{RepoRef, is_ngit_relay}, + repo_ref::{RepoRef, is_grasp_server}, }; use nostr::nips::nip19; use nostr_sdk::{Event, ToBech32}; @@ -54,7 +54,7 @@ pub async fn run_fetch( git_server_url, &repo_ref.to_nostr_git_url(&None), &term, - is_ngit_relay(git_server_url, &repo_ref.ngit_relays()), + is_grasp_server(git_server_url, &repo_ref.grasp_servers()), ) { errors.push(error); } else { @@ -164,7 +164,7 @@ pub fn fetch_from_git_server( git_server_url: &str, decoded_nostr_url: &NostrUrlDecoded, term: &console::Term, - is_ngit_relay: bool, + is_grasp_server: bool, ) -> Result<()> { let already_have_oids = oids .iter() @@ -176,7 +176,7 @@ pub fn fetch_from_git_server( let server_url = git_server_url.parse::()?; let protocols_to_attempt = - get_read_protocols_to_try(git_repo, &server_url, decoded_nostr_url, is_ngit_relay); + get_read_protocols_to_try(git_repo, &server_url, decoded_nostr_url, is_grasp_server); let mut failed_protocols = vec![]; let mut success = false; diff --git a/src/bin/git_remote_nostr/list.rs b/src/bin/git_remote_nostr/list.rs index c27e4d2..b9fb0c0 100644 --- a/src/bin/git_remote_nostr/list.rs +++ b/src/bin/git_remote_nostr/list.rs @@ -13,7 +13,7 @@ use ngit::{ }, git_events::event_to_cover_letter, login::get_curent_user, - repo_ref::{self, is_ngit_relay}, + repo_ref::{self, is_grasp_server}, }; use nostr_sdk::hashes::sha1::Hash as Sha1Hash; use repo_ref::RepoRef; @@ -41,12 +41,12 @@ pub async fn run_list( git_repo, &repo_ref.git_server, &repo_ref.to_nostr_git_url(&None), - &repo_ref.ngit_relays(), + &repo_ref.grasp_servers(), ); let mut state = if let Some(nostr_state) = nostr_state { for (name, value) in &nostr_state.state { - for (url, (remote_state, _is_ngit_relay)) in &remote_states { + for (url, (remote_state, _is_grasp_server)) in &remote_states { let remote_name = get_short_git_server_name(git_repo, url); if let Some(remote_value) = remote_state.get(name) { if value.ne(remote_value) { @@ -74,7 +74,7 @@ pub async fn run_list( } nostr_state.state } else { - let (state, _is_ngit_relay) = repo_ref + let (state, _is_grasp_server) = repo_ref .git_server .iter() .filter_map(|server| remote_states.get(server)) @@ -122,7 +122,7 @@ async fn get_open_and_draft_proposals_state( // without trusting commit_id we must apply each patch which requires the oid of // the parent so we much do a fetch - for (git_server_url, (oids_from_git_servers, is_ngit_relay)) in remote_states { + for (git_server_url, (oids_from_git_servers, is_grasp_server)) in remote_states { if fetch_from_git_server( git_repo, &oids_from_git_servers @@ -133,7 +133,7 @@ async fn get_open_and_draft_proposals_state( git_server_url, &repo_ref.to_nostr_git_url(&None), term, - *is_ngit_relay, + *is_grasp_server, ) .is_ok() { @@ -178,18 +178,18 @@ pub fn list_from_remotes( git_repo: &Repo, git_servers: &Vec, decoded_nostr_url: &NostrUrlDecoded, - ngit_relays: &[String], + grasp_servers: &[String], ) -> HashMap, bool)> { let mut remote_states = HashMap::new(); let mut errors = HashMap::new(); for url in git_servers { - let is_ngit_relay = is_ngit_relay(url, ngit_relays); - match list_from_remote(term, git_repo, url, decoded_nostr_url, is_ngit_relay) { + let is_grasp_server = is_grasp_server(url, grasp_servers); + match list_from_remote(term, git_repo, url, decoded_nostr_url, is_grasp_server) { Err(error) => { errors.insert(url, error); } Ok(state) => { - remote_states.insert(url.to_string(), (state, is_ngit_relay)); + remote_states.insert(url.to_string(), (state, is_grasp_server)); } } } @@ -201,11 +201,11 @@ pub fn list_from_remote( git_repo: &Repo, git_server_url: &str, decoded_nostr_url: &NostrUrlDecoded, - is_ngit_relay: bool, + is_grasp_server: bool, ) -> Result> { let server_url = git_server_url.parse::()?; let protocols_to_attempt = - get_read_protocols_to_try(git_repo, &server_url, decoded_nostr_url, is_ngit_relay); + get_read_protocols_to_try(git_repo, &server_url, decoded_nostr_url, is_grasp_server); let mut failed_protocols = vec![]; let mut remote_state: Option> = None; diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs index 9e54ca7..04fc4d8 100644 --- a/src/bin/git_remote_nostr/push.rs +++ b/src/bin/git_remote_nostr/push.rs @@ -25,7 +25,7 @@ use ngit::{ }, git_events::{self, event_to_cover_letter, get_event_root}, login::{self, user::UserRef}, - repo_ref::{self, get_repo_config_from_yaml, is_ngit_relay}, + repo_ref::{self, get_repo_config_from_yaml, is_grasp_server}, repo_state, }; use nostr::nips::nip10::Marker; @@ -79,7 +79,7 @@ pub async fn run_push( git_repo, &repo_ref.git_server, &repo_ref.to_nostr_git_url(&None), - &repo_ref.ngit_relays(), + &repo_ref.grasp_servers(), ) }); @@ -92,7 +92,7 @@ pub async fn run_push( .iter() .find(|&url| list_outputs.contains_key(url)) { - let (state, _is_ngit_relay) = list_outputs.get(url).unwrap().to_owned(); + let (state, _is_grasp_server) = list_outputs.get(url).unwrap().to_owned(); state } else { bail!( @@ -163,7 +163,7 @@ pub async fn run_push( &repo_ref.to_nostr_git_url(&None), &remote_refspecs, &term, - is_ngit_relay(&git_server_url, &repo_ref.ngit_relays()), + is_grasp_server(&git_server_url, &repo_ref.grasp_servers()), ); } } @@ -429,11 +429,11 @@ fn push_to_remote( decoded_nostr_url: &NostrUrlDecoded, remote_refspecs: &[String], term: &Term, - is_ngit_relay: bool, + is_grasp_server: bool, ) -> Result<()> { let server_url = git_server_url.parse::()?; let protocols_to_attempt = - get_write_protocols_to_try(git_repo, &server_url, decoded_nostr_url, is_ngit_relay); + get_write_protocols_to_try(git_repo, &server_url, decoded_nostr_url, is_grasp_server); let mut failed_protocols = vec![]; let mut success = false; @@ -726,8 +726,8 @@ fn create_rejected_refspecs_and_remotes_refspecs( let mut rejected_refspecs: HashMapUrlRefspecs = HashMap::new(); - for (url, (remote_state, is_ngit_relay)) in list_outputs { - let is_ngit_relay = is_ngit_relay.to_owned(); + for (url, (remote_state, is_grasp_server)) in list_outputs { + let is_grasp_server = is_grasp_server.to_owned(); let short_name = get_short_git_server_name(git_repo, url); let mut refspecs_for_remote = vec![]; for refspec in refspecs { @@ -788,7 +788,7 @@ fn create_rejected_refspecs_and_remotes_refspecs( if ahead_of_nostr.is_empty() { // ancestor of nostr and we are force pushing anyway... refspecs_for_remote.push(refspec.clone()); - } else if is_ngit_relay { + } else if is_grasp_server { // a grasp server can only be pushed to via nostr so can force push refspecs_for_remote.push(ensure_force_push_refspec(refspec)); } else { @@ -807,7 +807,7 @@ fn create_rejected_refspecs_and_remotes_refspecs( )?; } } - } else if is_ngit_relay { + } else if is_grasp_server { refspecs_for_remote.push(ensure_force_push_refspec(refspec)); } else { // remote_value oid is not present locally @@ -842,7 +842,7 @@ fn create_rejected_refspecs_and_remotes_refspecs( if ahead.is_empty() { // can soft push refspecs_for_remote.push(refspec.clone()); - } else if is_ngit_relay { + } else if is_grasp_server { refspecs_for_remote.push(ensure_force_push_refspec(refspec)); } else { // cant soft push @@ -858,7 +858,7 @@ fn create_rejected_refspecs_and_remotes_refspecs( ).as_str(), )?; } - } else if is_ngit_relay { + } else if is_grasp_server { refspecs_for_remote.push(ensure_force_push_refspec(refspec)); } else { // havn't fetched oid from remote diff --git a/src/bin/git_remote_nostr/utils.rs b/src/bin/git_remote_nostr/utils.rs index ec6412b..f7e688e 100644 --- a/src/bin/git_remote_nostr/utils.rs +++ b/src/bin/git_remote_nostr/utils.rs @@ -216,9 +216,9 @@ pub fn get_read_protocols_to_try( git_repo: &Repo, server_url: &CloneUrl, decoded_nostr_url: &NostrUrlDecoded, - is_ngit_relay: bool, + is_grasp_server: bool, ) -> Vec { - if is_ngit_relay { + if is_grasp_server { if server_url.protocol() == ServerProtocol::Http { vec![(ServerProtocol::UnauthHttp)] } else { @@ -269,9 +269,9 @@ pub fn get_write_protocols_to_try( git_repo: &Repo, server_url: &CloneUrl, decoded_nostr_url: &NostrUrlDecoded, - is_ngit_relay: bool, + is_grasp_server: bool, ) -> Vec { - if is_ngit_relay { + if is_grasp_server { if server_url.protocol() == ServerProtocol::Http { vec![(ServerProtocol::UnauthHttp)] } else { -- cgit v1.2.3