summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobin Krahl <robin.krahl@ireas.org>2020-01-25 14:15:50 +0100
committerDaniel Mueller <deso@posteo.net>2021-01-10 10:15:44 -0800
commitfadd56a14310aea6a3f2d86693aa8e1dd8c12b67 (patch)
treefc999401b1ff932a0f554b9558bbdda3e4ca35fa /src
parenta7668265d507a7214b312c5dce874f0185b7b09a (diff)
downloadnitrocli-fadd56a14310aea6a3f2d86693aa8e1dd8c12b67.tar.gz
nitrocli-fadd56a14310aea6a3f2d86693aa8e1dd8c12b67.tar.bz2
Use standard configuration file locations
This patch uses the directories crate to query the appropriate path for the configuration files. For Linux, paths according to the XDG Base Directory Specification are used. Note that directories does not yet support the XDG_CONFIG_DIRS variable for system-wide configuration files. Therefore we only use a user configuration file.
Diffstat (limited to 'src')
-rw-r--r--src/config.rs12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/config.rs b/src/config.rs
index 2e8f3ba..ee3392b 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -24,6 +24,14 @@ use crate::args;
use anyhow::Context as _;
+/// The name of nitrocli's configuration file relative to the
+/// application configuration directory.
+///
+/// The application configuration directory is determined using the
+/// `directories` crate. For Unix, it is `$XDG_CONFIG_HOME/nitrocli`
+/// (defaults to `$HOME/.config/nitrocli`).
+const CONFIG_FILE: &str = "config.toml";
+
/// The configuration for nitrocli, usually read from configuration
/// files and environment variables.
#[derive(Clone, Copy, Debug, Default, PartialEq, merge::Merge, serde::Deserialize)]
@@ -64,7 +72,9 @@ impl Config {
}
fn load_user_config() -> anyhow::Result<Option<Config>> {
- let path = path::Path::new("config.toml");
+ let project_dirs = directories::ProjectDirs::from("", "", "nitrocli")
+ .context("Could not determine the nitrocli application directory")?;
+ let path = project_dirs.config_dir().join(CONFIG_FILE);
if path.is_file() {
read_config_file(&path).map(Some)
} else {