Merge pull request #53 from jgardona/fix/remove-error-main

Remove error implementation from main.rs
jgardona · Dec 4, 2023 · 94f4a50 · 94f4a50
2 parents 959470b + efdaf4c
commit 94f4a50
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 40 deletions.
diff --git a/src/cli.rs b/src/cli.rs
@@ -4,7 +4,7 @@ mod view;
 
 use clap::Parser;
 
-use crate::CliError;
+use crate::cli::errors::CliError;
 
 use self::{
     errors::{Result, ERR_CANT_PARSE_NUMBER, ERR_NOT_AVAILABLE_DATA},
@@ -49,52 +49,54 @@ pub fn execute() -> Result<()> {
     let length = parse_unit(&cli.length.unwrap_or("0".into()))?;
     let skip = parse_unit(&cli.skip)?;
 
-    let data = read_data(skip, length, &cli.filename)
-        .map_err(|_| CliError(ERR_NOT_AVAILABLE_DATA.into()))?;
+    let data = read_data(skip, length, &cli.filename).map_err(|_| CliError {
+        message: ERR_NOT_AVAILABLE_DATA.into(),
+    })?;
     display_data(skip, !cli.squeeze, &data, &mut std::io::stdout().lock())?;
 
     Ok(())
 }
 
 fn parse_unit(input: &str) -> std::result::Result<usize, CliError> {
     if let Some(suffix) = input.strip_suffix("kb") {
-        let mut value = suffix
-            .parse::<usize>()
-            .map_err(|_| CliError(ERR_CANT_PARSE_NUMBER.into()))?;
+        let mut value = suffix.parse::<usize>().map_err(|_| CliError {
+            message: ERR_CANT_PARSE_NUMBER.into(),
+        })?;
         value *= 1000;
         Ok(value)
     } else if let Some(suffix) = input.strip_suffix("mb") {
-        let mut value = suffix
-            .parse::<usize>()
-            .map_err(|_| CliError(ERR_CANT_PARSE_NUMBER.into()))?;
+        let mut value = suffix.parse::<usize>().map_err(|_| CliError {
+            message: ERR_CANT_PARSE_NUMBER.into(),
+        })?;
         value *= 1000 * 1000;
         Ok(value)
     } else if let Some(suffix) = input.strip_suffix('K') {
-        let mut value = suffix
-            .parse::<usize>()
-            .map_err(|_| CliError(ERR_CANT_PARSE_NUMBER.into()))?;
+        let mut value = suffix.parse::<usize>().map_err(|_| CliError {
+            message: ERR_CANT_PARSE_NUMBER.into(),
+        })?;
         value *= 1024;
         Ok(value)
     } else if let Some(suffix) = input.strip_suffix('M') {
-        let mut value = suffix
-            .parse::<usize>()
-            .map_err(|_| CliError(ERR_CANT_PARSE_NUMBER.into()))?;
+        let mut value = suffix.parse::<usize>().map_err(|_| CliError {
+            message: ERR_CANT_PARSE_NUMBER.into(),
+        })?;
         value *= 1024 * 1024;
         Ok(value)
     } else if let Some(prefix) = input.strip_prefix("0x") {
-        let value = usize::from_str_radix(prefix, 16)
-            .map_err(|_| CliError(ERR_CANT_PARSE_NUMBER.into()))?;
+        let value = usize::from_str_radix(prefix, 16).map_err(|_| CliError {
+            message: ERR_CANT_PARSE_NUMBER.into(),
+        })?;
         Ok(value)
     } else {
-        input
-            .parse::<usize>()
-            .map_err(|_| CliError(ERR_CANT_PARSE_NUMBER.into()))
+        input.parse::<usize>().map_err(|_| CliError {
+            message: ERR_CANT_PARSE_NUMBER.into(),
+        })
     }
 }
 
 #[cfg(test)]
 mod test_cli {
-    use crate::{cli::errors::ERR_CANT_PARSE_NUMBER, CliError};
+    use crate::{cli::errors::CliError, cli::errors::ERR_CANT_PARSE_NUMBER};
 
     use super::parse_unit;
     use anyhow::{Ok, Result};
@@ -137,27 +139,39 @@ mod test_cli {
         let result = parse_unit("0x400")?;
         assert_eq!(expected, result);
 
-        let expected = CliError(ERR_CANT_PARSE_NUMBER.into());
+        let expected = CliError {
+            message: ERR_CANT_PARSE_NUMBER.into(),
+        };
         let result = parse_unit("fffkb").unwrap_err();
         assert_eq!(expected.to_string(), result.to_string());
 
-        let expected = CliError(ERR_CANT_PARSE_NUMBER.into());
+        let expected = CliError {
+            message: ERR_CANT_PARSE_NUMBER.into(),
+        };
         let result = parse_unit("fffmb").unwrap_err();
         assert_eq!(expected.to_string(), result.to_string());
 
-        let expected = CliError(ERR_CANT_PARSE_NUMBER.into());
+        let expected = CliError {
+            message: ERR_CANT_PARSE_NUMBER.into(),
+        };
         let result = parse_unit("fffK").unwrap_err();
         assert_eq!(expected.to_string(), result.to_string());
 
-        let expected = CliError(ERR_CANT_PARSE_NUMBER.into());
+        let expected = CliError {
+            message: ERR_CANT_PARSE_NUMBER.into(),
+        };
         let result = parse_unit("fffM").unwrap_err();
         assert_eq!(expected.to_string(), result.to_string());
 
-        let expected = CliError(ERR_CANT_PARSE_NUMBER.into());
+        let expected = CliError {
+            message: ERR_CANT_PARSE_NUMBER.into(),
+        };
         let result = parse_unit("0xkkk").unwrap_err();
         assert_eq!(expected.to_string(), result.to_string());
 
-        let expected = CliError(ERR_CANT_PARSE_NUMBER.into());
+        let expected = CliError {
+            message: ERR_CANT_PARSE_NUMBER.into(),
+        };
         let result = parse_unit("ff").unwrap_err();
         assert_eq!(expected.to_string(), result.to_string());
 

diff --git a/src/cli/errors.rs b/src/cli/errors.rs
@@ -1,9 +1,24 @@
+use std::fmt::Display;
+
 pub type Error = Box<dyn std::error::Error>;
 pub type Result<T> = std::result::Result<T, Error>;
 pub static ERR_CANT_PARSE_NUMBER: &str = "Cant parse input number";
 pub static ERR_NOT_AVAILABLE_DATA: &str =
     "Cant read data. Check if you are trying to read more than is available, or if the file exists";
 
+#[derive(Debug)]
+pub struct CliError {
+    pub message: String,
+}
+
+impl std::error::Error for CliError {}
+
+impl Display for CliError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.message)
+    }
+}
+
 #[cfg(test)]
 mod errors_test {
     use std::{error::Error, fmt::Display};

diff --git a/src/main.rs b/src/main.rs
@@ -1,20 +1,7 @@
-use std::{error::Error, fmt::Display};
-
 use cli::execute;
 
 mod cli;
 
-#[derive(Debug)]
-pub struct CliError(String);
-
-impl Error for CliError {}
-
-impl Display for CliError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
 fn main() {
     execute().unwrap_or_else(|e| {
         eprintln!("Something wrong happened: {e}");