simono41/steamguard-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix default maFiles path from args handling

Browse source
This commit is contained in:
Carson McManus 2021-08-12 18:36:03 -04:00
parent a5f9f7671b
commit 0af027b27e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main.rs
View file

@ -117,7 +117,11 @@ fn main() {
return; return;
} }
let mafiles_dir = get_mafiles_dir(matches.value_of("mafiles-path")); let mafiles_dir = if matches.occurrences_of("mafiles-path") > 0 {
matches.value_of("mafiles-path").unwrap().into()
} else {
get_mafiles_dir()
};
info!("reading manifest from {}", mafiles_dir); info!("reading manifest from {}", mafiles_dir);
let path = Path::new(&mafiles_dir).join("manifest.json"); let path = Path::new(&mafiles_dir).join("manifest.json");
let mut manifest: accountmanager::Manifest; let mut manifest: accountmanager::Manifest;
@ -677,11 +681,7 @@ fn demo_confirmation_menu() {
println!("accept: {}, deny: {}", accept.len(), deny.len()); println!("accept: {}, deny: {}", accept.len(), deny.len());
} }
fn get_mafiles_dir(arg: Option<&str>) -> String { fn get_mafiles_dir() -> String {
if let Some(arg_path) = arg {
return arg_path.into();
}
let paths = vec![ let paths = vec![
Path::new(&dirs::config_dir().unwrap()).join("steamguard-cli/maFiles"), Path::new(&dirs::config_dir().unwrap()).join("steamguard-cli/maFiles"),
Path::new(&dirs::home_dir().unwrap()).join("maFiles"), Path::new(&dirs::home_dir().unwrap()).join("maFiles"),