open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): add multiple possible backup locations to fix. #1051 (#1282)

Browse Source
This commit is contained in:
Federico Terzi 2022-07-03 14:03:45 +02:00 committed by GitHub
parent 4d0cc7a6f1
commit 1b947ec188
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
espanso/src/cli/migrate.rs
View File

@ -177,9 +177,8 @@ fn find_available_backup_dir() -> PathBuf {
"".to_string() "".to_string()
}; };
let target_backup_dir = dirs::document_dir() let target_backup_dir =
.expect("unable to generate backup directory") find_backup_dir_location().join(format!("espanso-migrate-backup{}", num));
.join(format!("espanso-migrate-backup{}", num));
if !target_backup_dir.is_dir() { if !target_backup_dir.is_dir() {
return target_backup_dir; return target_backup_dir;
@ -189,6 +188,22 @@ fn find_available_backup_dir() -> PathBuf {
panic!("could not generate valid backup directory"); panic!("could not generate valid backup directory");
} }
fn find_backup_dir_location() -> PathBuf {
if let Some(documents_dir) = dirs::document_dir() {
return documents_dir;
}
if let Some(home_dir) = dirs::home_dir() {
return home_dir;
}
if let Ok(current_dir) = std::env::current_dir() {
return current_dir;
}
panic!("unable to generate suitable backup location directory");
}
fn error_print_and_log(msg: &str) { fn error_print_and_log(msg: &str) {
error!("{}", msg); error!("{}", msg);
eprintln!("{}", msg); eprintln!("{}", msg);