diff --git a/Cargo.toml b/Cargo.toml index 60747a3..3ca5e55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,8 +11,7 @@ readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -#Fasching = "0.2.0" -Fasching = {path = "../Fasching/"} - +Fasching = "0.2.0" clap = { version = "4.5.4", features = ["derive"] } whoami = "1.5.1" +anyhow = "1.0.81" diff --git a/src/comparemode.rs b/src/comparemode.rs index 3692a46..8a1a3c5 100644 --- a/src/comparemode.rs +++ b/src/comparemode.rs @@ -1,3 +1,4 @@ +use anyhow::Error; use Fasching::snapshot::{Snapshot, SnapshotChangeType, SnapshotCompareResult}; use Fasching::{compare_snapshots, import_snapshot}; use crate::options::Arguments; @@ -34,7 +35,7 @@ impl CompareMode { } impl CompareMode { - pub(crate) fn run(&mut self) { + pub(crate) fn run(&mut self) -> Result<(), Error> { let selector = match &self.selection { None => "none", Some(r) => { @@ -65,7 +66,7 @@ impl CompareMode { } - match selector { + Ok(match selector { "created" => { print_if_not_empty!(self.results.created, self.count_only); } @@ -81,14 +82,11 @@ impl CompareMode { println!("Changed: {:?}", self.results.changed.len()); } _ => { - // println!("Created: {:?}", self.results.created.len()); - // println!("Deleted: {:?}", self.results.deleted.len()); - // println!("Changed: {:?}", self.results.changed.len()); + println!("Created: {:?}", self.results.created.len()); + println!("Deleted: {:?}", self.results.deleted.len()); + println!("Changed: {:?}", self.results.changed.len()); } - } - } - fn return_ret(&self) { - + }) } } diff --git a/src/createmode.rs b/src/createmode.rs index 2d1c4f7..410e4e7 100644 --- a/src/createmode.rs +++ b/src/createmode.rs @@ -1,5 +1,6 @@ use std::process::exit; use std::sync::{Arc, Mutex}; +use anyhow::Error; use Fasching::hasher::HashType::BLAKE3; use Fasching::snapshot::Snapshot; use Fasching::{create_snapshot, export_snapshot}; @@ -35,12 +36,13 @@ impl CreateMode { } impl CreateMode { - pub fn run(&mut self) { - let snapshot = create_snapshot(self.root_path.as_str(), BLAKE3, vec![]).unwrap(); + pub fn run(&mut self) -> Result<(), Error> { + let snapshot = create_snapshot(self.root_path.as_str(), BLAKE3, vec![])?; self.snapshot = snapshot.clone(); if let Ok(e) = snapshot.file_hashes.lock() { println!("Total FileHash Entries {}", e.len()); } - export_snapshot(self.snapshot.clone(), self.snapshot_path.clone(), true).unwrap(); + export_snapshot(self.snapshot.clone(), self.snapshot_path.clone(), true)?; + Ok(()) } }