npub1xs…vsp69 on Nostr: commit 5103dfcdf2ceb2478b0d21f7197c9da90a7dc27b Author: randymcmillan ...

commit 5103dfcdf2ceb2478b0d21f7197c9da90a7dc27b
Author: randymcmillan <[email protected]>
Date: Mon May 13 17:04:01 2024 -0400

gnostr-legit:fix gnostr-get/set-relays:intermediate

diff --git a/bins/src/bin/gnostr-legit.rs b/bins/src/bin/gnostr-legit.rs
index 7c4b94590..f265ce5a8 100644
--- a/bins/src/bin/gnostr-legit.rs
+++ b/bins/src/bin/gnostr-legit.rs
@@ -154,31 +154,37 @@ fn main() -> io::Result<()> {
//#!/bin/bash
//gnostr-git config --global --replace-all gnostr.relays "$(gnostr-get-relays)"
// #&& git config -l | grep gnostr.relays
- #[allow(clippy::if_same_then_else)]
- let set_relays = if cfg!(target_os = "windows") {
- Command::new("cmd")
- .args(["/C", "gnostr-set-relays"])
- .output()
- .expect("try:\ngit config -l | grep gnostr.relays")
- } else if cfg!(target_os = "macos") {
- Command::new("sh")
- .arg("-c")
- .arg("gnostr-set-relays")
- .output()
- .expect("try:\ngit config -l | grep gnostr.relays")
- } else if cfg!(target_os = "linux") {
- Command::new("sh")
- .arg("-c")
- .arg("gnostr-set-relays")
- .output()
- .expect("try:\ngit config -l | grep gnostr.relays")
- } else {
- Command::new("sh")
- .arg("-c")
- .arg("gnostr-set-relays")
- .output()
- .expect("try:\ngit config -l | grep gnostr.relays")
- };
+
+//TODO:
+//fix this
+//git config --global --replace-all gnostr.relays $(gnostr-get-relays)
+
+
+ //#[allow(clippy::if_same_then_else)]
+ //let set_relays = if cfg!(target_os = "windows") {
+ // Command::new("cmd")
+ // .args(["/C", "gnostr-set-relays"])
+ // .output()
+ // .expect("try:\ngit config -l | grep gnostr.relays")
+ //} else if cfg!(target_os = "macos") {
+ // Command::new("sh")
+ // .arg("-c")
+ // .arg("gnostr-set-relays")
+ // .output()
+ // .expect("try:\ngit config -l | grep gnostr.relays")
+ //} else if cfg!(target_os = "linux") {
+ // Command::new("sh")
+ // .arg("-c")
+ // .arg("gnostr-set-relays")
+ // .output()
+ // .expect("try:\ngit config -l | grep gnostr.relays")
+ //} else {
+ // Command::new("sh")
+ // .arg("-c")
+ // .arg("gnostr-set-relays")
+ // .output()
+ // .expect("try:\ngit config -l | grep gnostr.relays")
+ //};

let count = thread::available_parallelism()?.get();
assert!(count >= 1_usize);
diff --git a/bins/src/gitminer.rs b/bins/src/gitminer.rs
index 6c5b591e6..e7039360e 100644
--- a/bins/src/gitminer.rs
+++ b/bins/src/gitminer.rs
@@ -39,7 +39,7 @@ impl Gitminer {
};

let author = Gitminer::load_author(&repo)?;
- let relays = Gitminer::load_gnostr_relays(&repo)?;
+ let relays = "wss://relay.damus.io, wss://nos.lol"; //Gitminer::load_gnostr_relays(&repo)?;
let pwd_hash = Default::default();

Ok(Gitminer {
@@ -47,7 +47,7 @@ impl Gitminer {
repo,
author,
pwd_hash,
- relays,
+ relays: relays.to_string(),
})
}

@@ -205,23 +205,23 @@ impl Gitminer {
Ok(format!("{} <{}>", name, email))
}

- fn load_gnostr_relays(repo: &git2::Repository) -> Result<String, &'static str> {
- let cfg = match repo.config() {
- Ok(c) => c,
- Err(_) => {
- return Err("Failed to load git config gnostr.relays");
- }
- };
-
- let relays = match cfg.get_string("gnostr.relays") {
- Ok(s) => s,
- Err(_) => {
- return Err("Failed to find git config gnostr.relays");
- }
- };
-
- Ok(relays)
- }
+ //fn load_gnostr_relays(repo: &git2::Repository) -> Result<String, &'static str> {
+ // let cfg = match repo.config() {
+ // Ok(c) => c,
+ // Err(_) => {
+ // return Err("Failed to load git config gnostr.relays");
+ // }
+ // };
+
+ // let relays = match cfg.get_string("gnostr.relays") {
+ // Ok(s) => s,
+ // Err(_) => {
+ // return Err("Failed to find git config gnostr.relays");
+ // }
+ // };
+
+ // Ok(relays)
+ //}

fn revparse_0(repo: &mut git2::Repository) -> Result<String, &'static str> {
Gitminer::ensure_no_unstaged_changes(repo)?;