jason/socktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(client): refactor profile overwrite logic to satisfy clippy

Browse Source
This commit is contained in:
jasonwitty 2025-08-21 13:17:53 -07:00
parent b727e54589
commit a596acfb72
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
socktop/src/main.rs
View File

@ -117,27 +117,17 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
Some(entry) => { Some(entry) => {
let changed = entry.url != u || entry.tls_ca != t; let changed = entry.url != u || entry.tls_ca != t;
if changed { if changed {
if parsed.save { let overwrite = if parsed.save {
profiles_mut.profiles.insert( true
name.clone(), } else {
ProfileEntry { prompt_yes_no(&format!(
url: u.clone(), "Overwrite existing profile '{name}'? [y/N]: "
tls_ca: t.clone(), ))
}, };
); if overwrite {
profiles_mut.profiles.insert(name.clone(), ProfileEntry { url: u.clone(), tls_ca: t.clone() });
let _ = save_profiles(&profiles_mut); let _ = save_profiles(&profiles_mut);
} else if prompt_yes_no(&format!( }
"Overwrite existing profile '{name}'? [y/N]: "
)) {
profiles_mut.profiles.insert(
name.clone(),
ProfileEntry {
url: u.clone(),
tls_ca: t.clone(),
},
);
let _ = save_profiles(&profiles_mut);
} // else: do not overwrite, just connect with provided details
} }
} }
} }
@ -175,10 +165,22 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
ResolveProfile::PromptCreate(name) => { ResolveProfile::PromptCreate(name) => {
eprintln!("Profile '{name}' does not exist yet."); eprintln!("Profile '{name}' does not exist yet.");
let url = prompt_string("Enter URL (ws://HOST:PORT/ws or wss://...): ")?; let url = prompt_string("Enter URL (ws://HOST:PORT/ws or wss://...): ")?;
if url.trim().is_empty() { return Ok(()); } if url.trim().is_empty() {
return Ok(());
}
let ca = prompt_string("Enter TLS CA path (or leave blank): ")?; let ca = prompt_string("Enter TLS CA path (or leave blank): ")?;
let ca_opt = if ca.trim().is_empty() { None } else { Some(ca.trim().to_string()) }; let ca_opt = if ca.trim().is_empty() {
profiles_mut.profiles.insert(name.clone(), ProfileEntry { url: url.trim().to_string(), tls_ca: ca_opt.clone() }); None
} else {
Some(ca.trim().to_string())
};
profiles_mut.profiles.insert(
name.clone(),
ProfileEntry {
url: url.trim().to_string(),
tls_ca: ca_opt.clone(),
},
);
let _ = save_profiles(&profiles_mut); let _ = save_profiles(&profiles_mut);
(url.trim().to_string(), ca_opt) (url.trim().to_string(), ca_opt)
} }