From 686604665395385600ef8f1b5238a775249552a1 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Fri, 23 May 2025 10:01:29 +0100 Subject: feat: only try http(s) for ngit-relays otherwise it tries all the protocols and reprots on each --- src/bin/git_remote_nostr/fetch.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/bin/git_remote_nostr/fetch.rs') diff --git a/src/bin/git_remote_nostr/fetch.rs b/src/bin/git_remote_nostr/fetch.rs index 34a02fc..adc68b3 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, + repo_ref::{RepoRef, is_ngit_relay}, }; use nostr::nips::nip19; use nostr_sdk::{Event, ToBech32}; @@ -54,6 +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()), ) { errors.push(error); } else { @@ -163,6 +164,7 @@ pub fn fetch_from_git_server( git_server_url: &str, decoded_nostr_url: &NostrUrlDecoded, term: &console::Term, + is_ngit_relay: bool, ) -> Result<()> { let already_have_oids = oids .iter() @@ -173,7 +175,8 @@ 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); + let protocols_to_attempt = + get_read_protocols_to_try(git_repo, &server_url, decoded_nostr_url, is_ngit_relay); let mut failed_protocols = vec![]; let mut success = false; -- cgit v1.2.3