Merge b318031 into fa0b686

clafrica/data/invalid.toml

@@ -0,0 +1,2 @@
+# parsing error
+1a = à

clafrica/src/config.rs

@@ -35,8 +35,11 @@ struct DetailedData {
 
 impl Config {
     pub fn from_file(filepath: &Path) -> Result<Self, Box<dyn error::Error>> {
-        let content = fs::read_to_string(filepath)?;
-        let mut config: Self = toml::from_str(&content)?;
+        let content = fs::read_to_string(filepath)
+            .map_err(|err| format!("Couldn't open file `{filepath:?}`.\nCaused by:\n\t{err}."))?;
+        let mut config: Self = toml::from_str(&content).map_err(|err| {
+            format!("Failed to parse configuration file `{filepath:?}`.\nCaused by:\n\t{err}")
+        })?;
 
         let config_path = filepath.parent().unwrap();
 
@@ -115,15 +118,21 @@ mod tests {
         use std::path::Path;
 
         let conf = Config::from_file(Path::new("./data/config_sample.toml")).unwrap();
-        assert_eq!(conf.core.clone().unwrap().buffer_size, 12);
-        assert!(!conf.core.clone().unwrap().auto_capitalize);
+        assert_eq!(conf.core.as_ref().unwrap().buffer_size, 12);
+        assert!(!conf.core.as_ref().unwrap().auto_capitalize);
 
         let data = conf.extract_data();
         assert_eq!(data.keys().len(), 19);
 
-        let conf = Config::from_file(Path::new("./not_found"));
+        // parsing error
+        let conf = Config::from_file(Path::new("./data/invalid.toml"));
         assert!(conf.is_err());
 
+        // config file not found
+        let conf = Config::from_file(Path::new("./data/not_found"));
+        assert!(conf.is_err());
+
+        // data and and core not provided
         let conf = Config::from_file(Path::new("./data/blank_sample.toml")).unwrap();
         let data = conf.extract_data();
         assert_eq!(data.keys().len(), 0);

clafrica/src/lib.rs

@@ -5,13 +5,16 @@ use crate::api::Frontend;
 use clafrica_lib::{text_buffer, utils};
 use enigo::{Enigo, Key, KeyboardControllable};
 use rdev::{self, EventType, Key as E_Key};
-use std::{io, sync::mpsc, thread};
+use std::{error, sync::mpsc, thread};
 
 pub mod prelude {
     pub use crate::config::Config;
 }
 
-pub fn run(config: config::Config, mut frontend: impl Frontend) -> Result<(), io::Error> {
+pub fn run(
+    config: config::Config,
+    mut frontend: impl Frontend,
+) -> Result<(), Box<dyn error::Error>> {
     let map = utils::build_map(
         config
             .extract_data()