Merge pull request #7 from FxQnLr/webol-dev-9

Webol dev 9

1 files changed, 25 insertions, 14 deletions

diff --git a/src/config.rs b/src/config.rs
index 9a9e44b..769269c 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,19 +1,30 @@
-use config::Config;
-use once_cell::sync::Lazy;
+use serde::Deserialize;
 
-pub static SETTINGS: Lazy<Config> = Lazy::new(setup);
+#[derive(Deserialize)]
+pub struct Config {
+    pub apikey: String,
+    pub server: String,
+}
+
+impl Config {
+    pub fn load() -> Result<Config, config::ConfigError> {
+        let config_dir = dirs::config_dir();
+
+        let builder = config::Config::builder();
 
-fn setup() -> Config {
-    #[cfg(not(debug_assertions))]
-    let builder = Config::builder().add_source(config::File::with_name(
-        format!("{}/webol-cli.toml", dirs::config_dir().unwrap().to_string_lossy()).as_str(),
-    ));
+        let builder = if let Some(conf) = config_dir {
+            let dir = conf.to_string_lossy();
+            builder.add_source(config::File::with_name(format!("{dir}/webol-cli").as_str()).required(false))
+        } else {
+            println!("!No config dir found");
+            builder
+        };
 
-    #[cfg(debug_assertions)]
-    let builder = Config::builder().add_source(config::File::with_name("webol-cli.toml"));
+        let build = builder
+            .add_source(config::File::with_name("webol-cli").required(false))
+            .add_source(config::Environment::with_prefix("WEBOL_CLI").separator("_"))
+            .build()?;
 
-    builder
-        .add_source(config::Environment::with_prefix("WEBOL_CLI_").separator("_"))
-        .build()
-        .unwrap()
+        build.try_deserialize()
+    }
 }