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

feat(path): include argument to force config and runtime directories

Browse Source
This commit is contained in:
Federico Terzi 2021-05-05 21:04:53 +02:00
parent ddab54616d
commit f252c6a119
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,8 +30,10 @@ pub struct Paths {
pub packages: PathBuf, pub packages: PathBuf,
} }
pub fn resolve_paths() -> Paths { pub fn resolve_paths(force_config_dir: Option<&Path>, force_runtime_dir: Option<&Path>) -> Paths {
let config_dir = if let Some(config_dir) = get_config_dir() { let config_dir = if let Some(config_dir) = force_config_dir {
config_dir.to_path_buf()
} else if let Some(config_dir) = get_config_dir() {
config_dir config_dir
} else { } else {
// Create the config directory if not already present // Create the config directory if not already present
@ -41,7 +43,9 @@ pub fn resolve_paths() -> Paths {
config_dir config_dir
}; };
let runtime_dir = if let Some(runtime_dir) = get_runtime_dir() { let runtime_dir = if let Some(runtime_dir) = force_runtime_dir {
runtime_dir.to_path_buf()
} else if let Some(runtime_dir) = get_runtime_dir() {
runtime_dir runtime_dir
} else { } else {
// Create the runtime directory if not already present // Create the runtime directory if not already present