feat: add anyhow

Cargo.toml

@@ -10,3 +10,4 @@ crossterm = "0.26"
 tui = { package = "ratatui", version = "0.22.0", features = ["all-widgets"]}
 shellexpand = "3.0.0"
 cfg-if = "1.0.0"
+anyhow = "1.0.76"

src/fm/command.rs

@@ -95,7 +95,7 @@ impl Command {
                     }
 
                     if let Err(e) = tree.cwd().refresh() {
-                        log::error(e);
+                        log::error(e.to_string())
                     }
                 }
                 _ => {

src/fm/dir.rs

@@ -1,6 +1,8 @@
 use crate::finder::match_and_score;
 use crate::log;
 
+use anyhow::{Context, Result};
+
 use super::file::File;
 
 use std::fs::{self, canonicalize, read_dir, read_link};
@@ -24,57 +26,49 @@ pub struct Dir {
 }
 
 impl Dir {
-    pub fn new(dir_name: PathBuf) -> Result<Dir, String> {
+    pub fn new(dir_name: PathBuf) -> Result<Dir> {
         let mut files = Vec::new();
-        match read_dir(&dir_name) {
-            Ok(dir) => {
-                for entry in dir {
-                    match File::new(entry.unwrap()) {
-                        Ok(file) => {
-                            files.push(file);
-                        }
-                        Err(e) => log::error(e),
-                    }
+        let dir = read_dir(&dir_name).context(format!("could not read dir {dir_name:?}"))?;
+        for entry in dir {
+            match File::new(entry.unwrap()) {
+                Ok(file) => {
+                    files.push(file);
                 }
+                Err(e) => log::error(e),
+            }
+        }
 
-                files.sort_by(|a, b| a.name.cmp(&b.name));
+        files.sort_by(|a, b| a.name.cmp(&b.name));
 
-                let path = canonicalize(&dir_name).expect("could not canonicalize directory");
+        let path = canonicalize(&dir_name).expect("could not canonicalize directory");
 
-                let mut state = ListState::default();
-                state.select(Some(0));
-                Ok(Dir {
-                    state,
-                    visible_files: files.clone(),
-                    last_selection: 0,
-                    files,
-                    path,
-                })
-            }
-            Err(e) => Err(format!("could not read dir {dir_name:?}: {e}")),
-        }
+        let mut state = ListState::default();
+        state.select(Some(0));
+        Ok(Dir {
+            state,
+            visible_files: files.clone(),
+            last_selection: 0,
+            files,
+            path,
+        })
     }
 
-    pub fn refresh(&mut self) -> Result<(), String> {
+    pub fn refresh(&mut self) -> Result<()> {
         let mut files = Vec::new();
-        match read_dir(&self.path) {
-            Ok(dir) => {
-                for entry in dir {
-                    match File::new(entry.unwrap()) {
-                        Ok(file) => {
-                            files.push(file);
-                        }
-                        Err(e) => log::error(e),
-                    }
+        let dir = read_dir(&self.path).context("could not refresh dir")?;
+        for entry in dir {
+            match File::new(entry.unwrap()) {
+                Ok(file) => {
+                    files.push(file);
                 }
-
-                files.sort_by(|a, b| a.name.cmp(&b.name));
-
-                self.files = files;
-                Ok(())
+                Err(e) => log::error(e),
             }
-            Err(e) => Err(format!("could not refresh dir: {e}")),
         }
+
+        files.sort_by(|a, b| a.name.cmp(&b.name));
+
+        self.files = files;
+        Ok(())
     }
 
     pub fn rename_selected(&mut self, new_name: &str, show_hidden: bool) {

src/fm/fm.rs

@@ -1,3 +1,4 @@
+use anyhow::Result;
 use crossterm::event::{self, Event, KeyEvent};
 use std::io;
 
@@ -22,7 +23,7 @@ pub struct FM {
 }
 
 impl FM {
-    pub fn new() -> Result<FM, String> {
+    pub fn new() -> Result<FM> {
         Ok(FM {
             tree: Tree::new()?,
             state: State::default(),

src/fm/render.rs

@@ -13,6 +13,8 @@ use tui::{
     Frame, Terminal,
 };
 
+use anyhow::Result;
+
 use super::{dir::Dir, fm::FM, state::Mode, tree::Tree};
 
 pub fn setup_tui() -> io::Result<Terminal<CrosstermBackend<Stdout>>> {
@@ -34,7 +36,7 @@ pub fn teardown_tui(terminal: &mut Terminal<CrosstermBackend<Stdout>>) -> io::Re
     Ok(())
 }
 
-pub fn render<B: Backend>(fm: &mut FM, f: &mut Frame<B>) -> Result<(), String> {
+pub fn render<B: Backend>(fm: &mut FM, f: &mut Frame<B>) -> Result<()> {
     let hide_parent = fm.state.hide_parent;
     // TODO: add to config
     if f.size().width < 80 {

src/fm/tree.rs

@@ -1,3 +1,5 @@
+use anyhow::{Context, Result};
+
 use super::dir::Dir;
 use super::state::State;
 use std::{
@@ -11,7 +13,7 @@ pub struct Tree {
 }
 
 impl Tree {
-    pub fn new() -> Result<Tree, String> {
+    pub fn new() -> Result<Tree> {
         let parent = Dir::new(Tree::parent_path()?)?;
         let cwd = Dir::new(Tree::cwd_path()?)?;
 
@@ -22,11 +24,11 @@ impl Tree {
         Ok(Tree { fs })
     }
 
-    pub fn parent_path() -> Result<PathBuf, String> {
-        fs::canonicalize(Path::new("..")).map_err(|e| format!("could not get parent path {e}"))
+    pub fn parent_path() -> Result<PathBuf> {
+        fs::canonicalize(Path::new("..")).context("could not get parent path")
     }
-    pub fn cwd_path() -> Result<PathBuf, String> {
-        fs::canonicalize(Path::new(".")).map_err(|e| format!("could not get cwd path {e}"))
+    pub fn cwd_path() -> Result<PathBuf> {
+        fs::canonicalize(Path::new(".")).context("could not get cwd path")
     }
 
     pub fn parent(&mut self) -> &mut Dir {

src/main.rs

@@ -1,18 +1,12 @@
 use fm::FM;
 
-use std::error::Error;
+use anyhow::Result;
 
 mod finder;
 mod fm;
 mod log;
 
-fn main() -> Result<(), Box<dyn Error>> {
-    let mut fm = FM::new()?;
-
-    let res = fm.run();
-
-    if let Err(err) = res {
-        println!("{:?}", err)
-    }
+fn main() -> Result<()> {
+    FM::new()?.run()?;
     Ok(())
 }