Better error handling

Cargo.toml

@@ -20,6 +20,7 @@ priority = "optional"
 section = "utility"
 
 [dependencies]
+anyhow = "1.0"
 askalono = "0.4.3"
 byte-unit = "4.0.12"
 bytecount = "0.6.2"
@@ -28,7 +29,6 @@ chrono-humanize = "0.2.1"
 clap = "2.33.3"
 color_quant = "1.1.0"
 colored = "2.0.0"
-error-chain = "0.12"
 git2 = {version = "0.13.20", default-features = false}
 image = "0.23.14"
 json = "0.12.4"

src/cli.rs

@@ -1,10 +1,10 @@
-use crate::error::*;
 use crate::info::deps::package_manager::PackageManager;
 use crate::info::info_field::{InfoField, InfoFieldOff};
 use crate::info::language::Language;
 use crate::ui::image_backends;
 use crate::ui::image_backends::ImageBackend;
 use crate::ui::printer::SerializationFormat;
+use anyhow::{Context, Result};
 use clap::{crate_description, crate_name, crate_version, App, AppSettings, Arg};
 use image::DynamicImage;
 use regex::Regex;
@@ -216,10 +216,9 @@ impl Config {
             .value_name("REGEX")
             .help("Exclude [bot] commits. Use <REGEX> to override the default pattern.")
             .validator(|p| {
-                if Regex::from_str(&p).is_err() {
-                    Err(String::from("must be a valid regex pattern"))
-                } else {
-                    Ok(())
+                match Regex::from_str(&p) {
+                    Ok(_) => Ok(()),
+                    Err(_) => Err(String::from("must be a valid regex pattern"))
                 }
             }),
         )
@@ -252,10 +251,10 @@ impl Config {
             .default_value("3")
             .help("NUM of authors to be shown.")
             .validator(|t| {
-                t.parse::<u32>()
-                    .map_err(|_t| "must be a number")
-                    .map(|_t|())
-                    .map_err(|e| e.to_string())
+                match t.parse::<u32>() {
+                    Ok(_) => Ok(()),
+                    Err(_) => Err(String::from("must be a number"))
+                }
             })
         )
         .arg(
@@ -286,6 +285,7 @@ impl Config {
             Some("auto") => is_truecolor_terminal(),
             _ => unreachable!(),
         };
+
         let no_bold = matches.is_present("no-bold");
         let no_merges = matches.is_present("no-merges");
         let no_color_palette = matches.is_present("no-palette");
@@ -295,8 +295,7 @@ impl Config {
         let show_email = matches.is_present("email");
         let include_hidden = matches.is_present("hidden");
 
-        let output =
-            matches.value_of("output").map(SerializationFormat::from_str).transpose().unwrap();
+        let output = matches.value_of("output").map(SerializationFormat::from_str).transpose()?;
 
         let fields_to_hide: Vec<String> = if let Some(values) = matches.values_of("disable-fields")
         {
@@ -317,11 +316,11 @@ impl Config {
                     false
                 }
             }
-            _ => unreachable!("other values for --hide-logo are not allowed"),
+            _ => unreachable!(),
         };
 
         let image = if let Some(image_path) = matches.value_of("image") {
-            Some(image::open(image_path).chain_err(|| "Could not load the specified image")?)
+            Some(image::open(image_path).with_context(|| "Could not load the specified image")?)
         } else {
             None
         };
@@ -336,17 +335,16 @@ impl Config {
             None
         };
 
-        if image.is_some() && image_backend.is_none() {
-            return Err("Could not detect a supported image backend".into());
-        }
-
         let image_color_resolution = if let Some(value) = matches.value_of("color-resolution") {
-            usize::from_str(value).unwrap()
+            usize::from_str(value)?
         } else {
             16
         };
 
-        let repo_path = String::from(matches.value_of("input").unwrap());
+        let repo_path = matches
+            .value_of("input")
+            .map(String::from)
+            .with_context(|| "Failed to parse input directory")?;
 
         let ascii_input = matches.value_of("ascii-input").map(String::from);
 
@@ -366,20 +364,14 @@ impl Config {
             Vec::new()
         };
 
-        let number_of_authors: usize = matches.value_of("authors-number").unwrap().parse().unwrap();
+        let number_of_authors: usize = matches.value_of("authors-number").unwrap().parse()?;
 
-        let mut ignored_directories: Vec<String> = Vec::new();
-        if let Some(user_ignored_directories) = matches.values_of("exclude") {
-            let re = Regex::new(r"((.*)+/)+(.*)").unwrap();
-            for user_ignored_directory in user_ignored_directories {
-                if re.is_match(&user_ignored_directory) {
-                    let prefix = if user_ignored_directory.starts_with('/') { "**" } else { "**/" };
-                    ignored_directories.push(format!("{}{}", prefix, user_ignored_directory));
-                } else {
-                    ignored_directories.push(String::from(user_ignored_directory));
-                }
-            }
-        };
+        let ignored_directories =
+            if let Some(user_ignored_directories) = matches.values_of("exclude") {
+                user_ignored_directories.map(String::from).collect()
+            } else {
+                Vec::new()
+            };
 
         let bot_regex_pattern = matches.is_present("no-bots").then(|| {
             matches

src/info/deps/mod.rs

@@ -1,8 +1,6 @@
-use {
-    crate::error::*,
-    std::collections::HashMap,
-    std::{ffi::OsStr, fs},
-};
+use anyhow::Result;
+use std::collections::HashMap;
+use std::{ffi::OsStr, fs};
 
 pub mod package_manager;
 
@@ -20,8 +18,7 @@ impl DependencyDetector {
     }
 
     pub fn get_dependencies(&self, dir: &str) -> Result<String> {
-        let deps = fs::read_dir(dir)
-            .chain_err(|| "Could not read directory")?
+        let deps = fs::read_dir(dir)?
             .filter_map(std::result::Result::ok)
             .map(|entry| entry.path())
             .filter(|entry| {
@@ -35,10 +32,10 @@ impl DependencyDetector {
             .map(|entry| {
                 let (parser, found_package_manager) =
                     &self.package_managers[entry.file_name().unwrap().to_str().unwrap()];
-                let contents = fs::read_to_string(entry)?;
-                let number_of_deps = parser(&contents)?;
+                let contents = fs::read_to_string(entry).unwrap_or_default();
+                let number_of_deps = parser(&contents).unwrap();
                 match number_of_deps {
-                    0 => Err("".into()),
+                    0 => Err(""),
                     _ => Ok(format!("{} ({})", number_of_deps, found_package_manager)),
                 }
             })

src/info/deps/package_manager.rs

@@ -1,6 +1,9 @@
-use crate::error::*;
+use anyhow::Result;
+use regex::Regex;
 use std::collections::HashMap;
-use {regex::Regex, strum::EnumIter, toml::Value, yaml_rust::YamlLoader};
+use strum::EnumIter;
+use toml::Value;
+use yaml_rust::YamlLoader;
 
 macro_rules! define_package_managers {
     ($( { $name:ident, $display:literal, [$(($file:literal, $parser:expr))+] } ),+ ,) => {

src/info/info_field.rs

@@ -1,4 +1,4 @@
-use crate::error::*;
+use anyhow::Result;
 use std::str::FromStr;
 use strum::{EnumCount, EnumIter, EnumString, IntoStaticStr};