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

Merge branch 'Scrumplex-fix-use-correct-system-directories' into dev

Browse Source
This commit is contained in:
Federico Terzi 2019-10-08 23:19:18 +02:00
commit 1f5b79be34
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/config/mod.rs
View File

@ -320,13 +320,13 @@ impl ConfigSet {
} }
pub fn load_default() -> Result<ConfigSet, ConfigLoadError> { pub fn load_default() -> Result<ConfigSet, ConfigLoadError> {
let espanso_dir = ConfigSet::get_default_config_dir(); let config_dir = ConfigSet::get_default_config_dir();
// Create the espanso dir if id doesn't exist // Create the espanso dir if it doesn't exist
let res = create_dir_all(espanso_dir.as_path()); let res = create_dir_all(config_dir.as_path());
if res.is_ok() { if res.is_ok() {
let default_file = espanso_dir.join(DEFAULT_CONFIG_FILE_NAME); let default_file = config_dir.join(DEFAULT_CONFIG_FILE_NAME);
// If config file does not exist, create one from template // If config file does not exist, create one from template
if !default_file.exists() { if !default_file.exists() {
@ -338,7 +338,7 @@ impl ConfigSet {
// Create auxiliary directories // Create auxiliary directories
let user_config_dir = espanso_dir.join(USER_CONFIGS_FOLDER_NAME); let user_config_dir = config_dir.join(USER_CONFIGS_FOLDER_NAME);
if !user_config_dir.exists() { if !user_config_dir.exists() {
let res = create_dir_all(user_config_dir.as_path()); let res = create_dir_all(user_config_dir.as_path());
if res.is_err() { if res.is_err() {
@ -346,7 +346,7 @@ impl ConfigSet {
} }
} }
let packages_dir = espanso_dir.join(PACKAGES_FOLDER_NAME); let packages_dir = ConfigSet::get_default_packages_dir().join(PACKAGES_FOLDER_NAME);
if !packages_dir.exists() { if !packages_dir.exists() {
let res = create_dir_all(packages_dir.as_path()); let res = create_dir_all(packages_dir.as_path());
if res.is_err() { if res.is_err() {
@ -354,20 +354,20 @@ impl ConfigSet {
} }
} }
return ConfigSet::load(espanso_dir.as_path()) return ConfigSet::load(config_dir.as_path())
} }
Err(ConfigLoadError::UnableToCreateDefaultConfig) Err(ConfigLoadError::UnableToCreateDefaultConfig)
} }
pub fn get_default_config_dir() -> PathBuf { pub fn get_default_config_dir() -> PathBuf {
let home_dir = dirs::home_dir().expect("Unable to get home directory"); let config_dir = dirs::config_dir().expect("Unable to get config directory");
home_dir.join(".espanso") config_dir.join("espanso")
} }
pub fn get_default_packages_dir() -> PathBuf { pub fn get_default_packages_dir() -> PathBuf {
let espanso_dir = ConfigSet::get_default_config_dir(); let data_dir = ConfigSet::get_default_config_dir();
espanso_dir.join(PACKAGES_FOLDER_NAME) data_dir.join(PACKAGES_FOLDER_NAME)
} }
} }

2
src/context/mod.rs
View File

@ -36,7 +36,7 @@ pub trait Context {
} }
pub fn get_data_dir() -> PathBuf { pub fn get_data_dir() -> PathBuf {
let data_dir = dirs::data_dir().expect("Can't obtain data_dir(), terminating."); let data_dir = dirs::data_local_dir().expect("Can't obtain data_dir(), terminating.");
let espanso_dir = data_dir.join("espanso"); let espanso_dir = data_dir.join("espanso");
create_dir_all(&espanso_dir).expect("Error creating espanso data directory"); create_dir_all(&espanso_dir).expect("Error creating espanso data directory");
espanso_dir espanso_dir