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

fix(client): correct profile overwrite prompt logic (only save on confirm or --save)

Browse Source
This commit is contained in:
jasonwitty 2025-08-21 12:48:53 -07:00
parent d049846564
commit 2af08c455a
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
socktop/src/main.rs
View File

@ -102,28 +102,34 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
// Possibly save if profile specified and --save or new entry // Possibly save if profile specified and --save or new entry
if let Some(name) = parsed.profile.as_ref() { if let Some(name) = parsed.profile.as_ref() {
let existing = profiles_mut.profiles.get(name); let existing = profiles_mut.profiles.get(name);
if existing.is_none() || parsed.save { match existing {
// If existing and not forced save, prompt None => {
if existing.is_some() && !parsed.save { // New profile: auto-save immediately
if prompt_yes_no(&format!("Overwrite existing profile '{name}'? [y/N]: ")) {
profiles_mut.profiles.insert( profiles_mut.profiles.insert(
name.clone(), name.clone(),
ProfileEntry { ProfileEntry { url: u.clone(), tls_ca: t.clone() },
url: u.clone(),
tls_ca: t.clone(),
},
); );
let _ = save_profiles(&profiles_mut); let _ = save_profiles(&profiles_mut);
} }
} else { Some(entry) => {
let changed = entry.url != u || entry.tls_ca != t;
if changed {
if parsed.save {
profiles_mut.profiles.insert( profiles_mut.profiles.insert(
name.clone(), name.clone(),
ProfileEntry { ProfileEntry { url: u.clone(), tls_ca: t.clone() },
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
}
} }
} }
} }