Fix error handling (#71)

* Change the return type of main function

* Fix the return type of decide_cell_width_type

* Fix the return type of Config::load

* Fix Deserialize implementation of KeyBind

* Fix the return type of Repository::load

* Define crate Result type

* Remove color-eyre

Author: lusingander

Cargo.lock

@@ -19,7 +19,6 @@ arboard = "3.4.1"
 base64 = "0.22.1"
 chrono = "0.4.39"
 clap = { version = "4.5.29", features = ["derive"] }
-color-eyre = "0.6.3"
 console = "0.15.10"
 fxhash = "0.2.1"
 image = "0.25.5"

Cargo.toml

@@ -1,53 +1,55 @@
 use ratatui::crossterm::terminal;
 
-use crate::graph::{CellWidthType, Graph};
+use crate::{
+    graph::{CellWidthType, Graph},
+    Result,
+};
 
 pub fn decide_cell_width_type(
     graph: &Graph,
     cell_width_type: Option<CellWidthType>,
-) -> std::io::Result<CellWidthType> {
+) -> Result<CellWidthType> {
     let (w, h) = terminal::size()?;
-    let cell_width_type =
-        decide_cell_width_type_from(graph.max_pos_x, w as usize, h as usize, cell_width_type);
-    Ok(cell_width_type)
+    decide_cell_width_type_from(graph.max_pos_x, w as usize, h as usize, cell_width_type)
 }
 
 fn decide_cell_width_type_from(
     max_pos_x: usize,
     term_width: usize,
     term_height: usize,
     cell_width_type: Option<CellWidthType>,
-) -> CellWidthType {
+) -> Result<CellWidthType> {
     let single_image_cell_width = max_pos_x + 1;
     let double_image_cell_width = single_image_cell_width * 2;
 
     match cell_width_type {
         Some(CellWidthType::Double) => {
             let required_width = double_image_cell_width + 2;
             if required_width > term_width {
-                panic!("Terminal size {term_width}x{term_height} is too small. Required width is {required_width} (graph_width = double).");
+                let msg = format!("Terminal size {term_width}x{term_height} is too small. Required width is {required_width} (graph_width = double).");
+                return Err(msg.into());
             }
-            CellWidthType::Double
+            Ok(CellWidthType::Double)
         }
         Some(CellWidthType::Single) => {
             let required_width = single_image_cell_width + 2;
             if required_width > term_width {
-                panic!("Terminal size {term_width}x{term_height} is too small. Required width is {required_width} (graph_width = single).");
+                let msg = format!("Terminal size {term_width}x{term_height} is too small. Required width is {required_width} (graph_width = single).");
+                return Err(msg.into());
             }
-            CellWidthType::Single
+            Ok(CellWidthType::Single)
         }
         None => {
             let double_required_width = double_image_cell_width + 2;
             if double_required_width <= term_width {
-                return CellWidthType::Double;
+                return Ok(CellWidthType::Double);
             }
             let single_required_width = single_image_cell_width + 2;
             if single_required_width <= term_width {
-                return CellWidthType::Single;
+                return Ok(CellWidthType::Single);
             }
-            panic!(
-                "Terminal size {term_width}x{term_height} is too small. Required width is {single_required_width} (graph_width = single) or {double_required_width} (graph_width = double)."
-            );
+            let msg = format!("Terminal size {term_width}x{term_height} is too small. Required width is {single_required_width} (graph_width = single) or {double_required_width} (graph_width = double).");
+            Err(msg.into())
         }
     }
 }

src/check.rs

@@ -7,17 +7,18 @@ use serde::Deserialize;
 use smart_default::SmartDefault;
 use umbra::optional;
 
-use crate::keybind::KeyBind;
+use crate::{keybind::KeyBind, Result};
 
 const APP_DIR_NAME: &str = "serie";
 const CONFIG_FILE_NAME: &str = "config.toml";
 const CONFIG_FILE_ENV_NAME: &str = "SERIE_CONFIG_FILE";
 
-pub fn load() -> (UiConfig, GraphConfig, Option<KeyBind>) {
+pub fn load() -> Result<(UiConfig, GraphConfig, Option<KeyBind>)> {
     let config = match config_file_path_from_env() {
         Some(user_path) => {
             if !user_path.exists() {
-                panic!("Config file not found: {:?}", user_path);
+                let msg = format!("Config file not found: {:?}", user_path);
+                return Err(msg.into());
             }
             read_config_from_path(&user_path)
         }
@@ -26,11 +27,11 @@ pub fn load() -> (UiConfig, GraphConfig, Option<KeyBind>) {
             if default_path.exists() {
                 read_config_from_path(&default_path)
             } else {
-                Config::default()
+                Ok(Config::default())
             }
         }
-    };
-    (config.ui, config.graph, config.keybind)
+    }?;
+    Ok((config.ui, config.graph, config.keybind))
 }
 
 fn config_file_path_from_env() -> Option<PathBuf> {
@@ -43,10 +44,10 @@ fn xdg_config_file_path() -> PathBuf {
         .get_config_file(CONFIG_FILE_NAME)
 }
 
-fn read_config_from_path(path: &Path) -> Config {
-    let content = std::fs::read_to_string(path).unwrap();
-    let config: OptionalConfig = toml::from_str(&content).unwrap();
-    config.into()
+fn read_config_from_path(path: &Path) -> Result<Config> {
+    let content = std::fs::read_to_string(path)?;
+    let config: OptionalConfig = toml::from_str(&content)?;
+    Ok(config.into())
 }
 
 #[optional(derives = [Deserialize])]