github/television
1
1
Fork 0
mirror of https://github.com/alexpasmantier/television.git synced 2025-06-07 12:05:34 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

fix(config): more consistent configuration file location for linux and macos (#9)

Browse Source
This commit is contained in:
Alexandre Pasmantier 2024-11-11 12:06:46 +01:00 committed by GitHub
parent 3a9ff067af
commit 81cf17bd5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/television/config.rs
View File

@ -92,20 +92,20 @@ pub struct Config {
} }
lazy_static! { lazy_static! {
pub static ref PROJECT_NAME: String = pub static ref PROJECT_NAME: String = String::from("television");
env!("CARGO_CRATE_NAME").to_uppercase().to_string(); pub static ref PROJECT_NAME_UPPER: String = PROJECT_NAME.to_uppercase().to_string();
pub static ref DATA_FOLDER: Option<PathBuf> = pub static ref DATA_FOLDER: Option<PathBuf> =
// if `TELEVISION_DATA` is set, use that as the data directory // if `TELEVISION_DATA` is set, use that as the data directory
env::var_os(format!("{}_DATA", PROJECT_NAME.clone())).or_else(|| { env::var_os(format!("{}_DATA", PROJECT_NAME_UPPER.clone())).or_else(|| {
// otherwise, use the XDG data directory // otherwise, use the XDG data directory
env::var_os("XDG_DATA_HOME") env::var_os("XDG_DATA_HOME")
}).map(PathBuf::from).filter(|p| p.is_absolute()); }).map(PathBuf::from).map(|p| p.join(PROJECT_NAME.as_str())).filter(|p| p.is_absolute());
pub static ref CONFIG_FOLDER: Option<PathBuf> = pub static ref CONFIG_FOLDER: Option<PathBuf> =
// if `TELEVISION_CONFIG` is set, use that as the config directory // if `TELEVISION_CONFIG` is set, use that as the config directory
env::var_os(format!("{}_CONFIG", PROJECT_NAME.clone())).or_else(|| { env::var_os(format!("{}_CONFIG", PROJECT_NAME_UPPER.clone())).or_else(|| {
// otherwise, use the XDG config directory // otherwise, use the XDG config directory
env::var_os("XDG_CONFIG_HOME") env::var_os("XDG_CONFIG_HOME")
}).map(PathBuf::from).filter(|p| p.is_absolute()); }).map(PathBuf::from).map(|p| p.join(PROJECT_NAME.as_str())).filter(|p| p.is_absolute());
} }
const CONFIG_FILE_NAME: &str = "config.toml"; const CONFIG_FILE_NAME: &str = "config.toml";