creating2morrow/neveko
1
0
Fork 0
mirror of https://github.com/creating2morrow/neveko.git synced 2025-03-15 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove panic on missing i2p-zero installation

Browse source
This commit is contained in:
creating2morrow 2023-05-04 08:50:56 -04:00
parent 5480823400
commit 3ba866277c
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
nevmes-core/src/i2p.rs
View file

@ -117,12 +117,20 @@ pub fn get_destination() -> String {
"/home/{}/.i2p-zero/config/tunnels.json",
env::var("USER").unwrap_or(String::from("user"))
);
let contents = fs::read_to_string(file_path).expect("read tunnels.json");
let input = format!(r#"{contents}"#);
let mut j: Tunnels = serde_json::from_str(&input).unwrap_or(Default::default());
let destination: String = j.tunnels.remove(0).dest.ok_or(utils::empty_string())
.unwrap_or(utils::empty_string());
destination
// Don't panic if i2p-zero isn't installed
let contents = match fs::read_to_string(file_path)
{
Ok(file) => file,
_=> utils::empty_string(),
};
if contents != utils::empty_string() {
let input = format!(r#"{contents}"#);
let mut j: Tunnels = serde_json::from_str(&input).unwrap_or(Default::default());
let destination: String = j.tunnels.remove(0).dest.ok_or(utils::empty_string())
.unwrap_or(utils::empty_string());
return destination
}
utils::empty_string()
}
pub async fn get_proxy_status() -> HttpProxyStatus {