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

fix(path): fix legacy runtime dir detection

Browse Source
This commit is contained in:
Federico Terzi 2021-07-20 20:09:26 +02:00
parent 0280738dd3
commit acf4286cd4
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
espanso-path/src/lib.rs
View File

@ -213,7 +213,7 @@ fn get_portable_runtime_path() -> Option<PathBuf> {
fn get_legacy_runtime_dir() -> Option<PathBuf> {
let data_dir = dirs::data_local_dir().expect("unable to obtain dirs::data_local_dir()");
let espanso_dir = data_dir.join("espanso");
if espanso_dir.is_dir() {
if is_legacy_runtime_dir(&espanso_dir) {
Some(espanso_dir)
} else {
None
@ -295,3 +295,30 @@ fn is_portable_mode() -> bool {
}
false
}
const LEGACY_RUNTIME_DIR_CANDIDATES_FILE: &[&'static str] = &[
"espanso.log",
"espanso.lock",
"espanso-worker.lock",
"espanso-daemon.lock",
];
// Run an heuristic to determine if the given directory
// is a legacy runtime dir or not.
// Unfortunately, due to the way the legacy path works
// we really have to analyse the content to determine this
// information
fn is_legacy_runtime_dir(path: &Path) -> bool {
if !path.is_dir() {
return false;
}
for candidate in LEGACY_RUNTIME_DIR_CANDIDATES_FILE {
let candidate_path = path.join(candidate);
if candidate_path.is_file() {
return true
}
}
false
}