diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2025-05-23 10:01:29 +0100 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2025-05-23 10:01:29 +0100 |
| commit | 686604665395385600ef8f1b5238a775249552a1 (patch) | |
| tree | 56a4c7a956e14dfbcdd4a518096968abc69583a6 /src/bin/git_remote_nostr/fetch.rs | |
| parent | cc9a3a1d8526373625246504f72f338fd89c8d8b (diff) | |
feat: only try http(s) for ngit-relays
otherwise it tries all the protocols and reprots on each
Diffstat (limited to 'src/bin/git_remote_nostr/fetch.rs')
| -rw-r--r-- | src/bin/git_remote_nostr/fetch.rs | 7 |
1 files changed, 5 insertions, 2 deletions
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::{ | |||
| 18 | }, | 18 | }, |
| 19 | git_events::tag_value, | 19 | git_events::tag_value, |
| 20 | login::get_curent_user, | 20 | login::get_curent_user, |
| 21 | repo_ref::RepoRef, | 21 | repo_ref::{RepoRef, is_ngit_relay}, |
| 22 | }; | 22 | }; |
| 23 | use nostr::nips::nip19; | 23 | use nostr::nips::nip19; |
| 24 | use nostr_sdk::{Event, ToBech32}; | 24 | use nostr_sdk::{Event, ToBech32}; |
| @@ -54,6 +54,7 @@ pub async fn run_fetch( | |||
| 54 | git_server_url, | 54 | git_server_url, |
| 55 | &repo_ref.to_nostr_git_url(&None), | 55 | &repo_ref.to_nostr_git_url(&None), |
| 56 | &term, | 56 | &term, |
| 57 | is_ngit_relay(git_server_url, &repo_ref.ngit_relays()), | ||
| 57 | ) { | 58 | ) { |
| 58 | errors.push(error); | 59 | errors.push(error); |
| 59 | } else { | 60 | } else { |
| @@ -163,6 +164,7 @@ pub fn fetch_from_git_server( | |||
| 163 | git_server_url: &str, | 164 | git_server_url: &str, |
| 164 | decoded_nostr_url: &NostrUrlDecoded, | 165 | decoded_nostr_url: &NostrUrlDecoded, |
| 165 | term: &console::Term, | 166 | term: &console::Term, |
| 167 | is_ngit_relay: bool, | ||
| 166 | ) -> Result<()> { | 168 | ) -> Result<()> { |
| 167 | let already_have_oids = oids | 169 | let already_have_oids = oids |
| 168 | .iter() | 170 | .iter() |
| @@ -173,7 +175,8 @@ pub fn fetch_from_git_server( | |||
| 173 | 175 | ||
| 174 | let server_url = git_server_url.parse::<CloneUrl>()?; | 176 | let server_url = git_server_url.parse::<CloneUrl>()?; |
| 175 | 177 | ||
| 176 | let protocols_to_attempt = get_read_protocols_to_try(git_repo, &server_url, decoded_nostr_url); | 178 | let protocols_to_attempt = |
| 179 | get_read_protocols_to_try(git_repo, &server_url, decoded_nostr_url, is_ngit_relay); | ||
| 177 | 180 | ||
| 178 | let mut failed_protocols = vec![]; | 181 | let mut failed_protocols = vec![]; |
| 179 | let mut success = false; | 182 | let mut success = false; |