Verbose error for missed files

Cargo.toml

@@ -31,6 +31,7 @@ lazy_static = "1.4.0"
 mockall = "0.11.4"
 handlebars = "4.5.0"
 systemstat = "0.2.3"
+dirs = "5.0.1"
 
 [build-dependencies]
 prost-build = "0.12"

src/bin/rusty_belt_server.rs

@@ -10,16 +10,17 @@ use rusty_belt::io::server::Server;
 use rusty_belt::state::rehydrator::Rehydrator;
 use rusty_belt::state::State;
 use std::collections::HashMap;
+use std::error::Error;
 use std::path::PathBuf;
 use std::sync::Arc;
 
 #[tokio::main]
-async fn main() {
+async fn main() -> Result<(), Box<dyn Error>> {
     let args = ServerArgs::parse();
 
-    let config_folder = get_config_path();
+    let config_folder = get_config_path().ok_or_else(|| "Can't find path for config")?;
 
-    let mut config_file = PathBuf::from(config_folder.clone());
+    let mut config_file = config_folder.clone();
     config_file.push("config.yaml");
 
     let mut log_config_file = PathBuf::from(config_folder.clone());
@@ -31,13 +32,26 @@ async fn main() {
         config_file
     };
 
-    log4rs::init_file(
-        args.log_config_path
-            .map(|cp| PathBuf::from(cp))
-            .unwrap_or(log_config_file),
-        Default::default(),
-    )
-    .unwrap();
+    path_to_config.try_exists().map_err(|_| {
+        format!(
+            "Can't find app config file. Expect it here: \n {}",
+            path_to_config.as_path().display()
+        )
+    })?;
+
+    let path_to_log = args
+        .log_config_path
+        .map(|cp| PathBuf::from(cp))
+        .unwrap_or(log_config_file);
+
+    path_to_log.try_exists().map_err(|_| {
+        format!(
+            "Can't find log config file. Expect it here: \n {}",
+            path_to_log.as_path().display()
+        )
+    })?;
+
+    log4rs::init_file(path_to_log, Default::default()).unwrap();
 
     let config: AppConfig = parse_config(&path_to_config);
     let models: HashMap<String, Vec<Box<dyn Model>>> = config
@@ -65,4 +79,5 @@ async fn main() {
 
     let server = Server::new(arc_state.clone(), addr);
     server.run().await;
+    Ok(())
 }

src/bin/tmux_client.rs

@@ -17,9 +17,9 @@ use std::error::Error;
 async fn main() -> Result<(), Box<dyn Error>> {
     let args = CliArgs::parse();
 
-    let config_folder = get_config_path();
+    let config_folder = get_config_path().ok_or_else(|| "Can't find path for config")?;
 
-    let mut config_file = PathBuf::from(config_folder.clone());
+    let mut config_file = config_folder.clone();
     config_file.push("config.yaml");
 
     let mut log_config_file = PathBuf::from(config_folder.clone());
@@ -31,13 +31,26 @@ async fn main() -> Result<(), Box<dyn Error>> {
         config_file
     };
 
-    log4rs::init_file(
-        args.log_config_path
-            .map(|cp| PathBuf::from(cp))
-            .unwrap_or(log_config_file),
-        Default::default(),
-    )
-    .unwrap();
+    path_to_config.try_exists().map_err(|_| {
+        format!(
+            "Can't find app config file. Expect it here: \n {}",
+            path_to_config.as_path().display()
+        )
+    })?;
+
+    let path_to_log = args
+        .log_config_path
+        .map(|cp| PathBuf::from(cp))
+        .unwrap_or(log_config_file);
+
+    path_to_log.try_exists().map_err(|_| {
+        format!(
+            "Can't find log config file. Expect it here: \n {}",
+            path_to_log.as_path().display()
+        )
+    })?;
+
+    log4rs::init_file(path_to_log, Default::default()).unwrap();
 
     let config: AppConfig = parse_config(&path_to_config);
     let segment_conf = config

src/fs.rs

@@ -1,12 +1,17 @@
-pub fn get_config_path() -> String {
-    let xdg_home = std::env::var("XDG_CONFIG_HOME").map(|mut s| {
-        s.push_str("/rusty-belt");
+use std::path::PathBuf;
+
+use dirs;
+
+pub fn get_config_path() -> Option<PathBuf> {
+    dirs::config_dir().map(|mut s| {
+        s.push("rusty-belt");
         s
-    });
-    let home = std::env::var("HOME").map(|mut s| {
-        s.push_str("/.config/rusty-belt");
+    })
+}
+
+pub fn get_data_path() -> Option<PathBuf> {
+    dirs::data_dir().map(|mut s| {
+        s.push("rusty-belt");
         s
-    });
-    let path = xdg_home.or(home).unwrap();
-    path
+    })
 }