feat: improve errors for removal command

domenicocinque · Jan 4, 2025 · 6acdf5b · 6acdf5b
1 parent 0fe351d
commit 6acdf5b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/errors.rs b/src/errors.rs
@@ -9,6 +9,7 @@ pub enum AppError {
     SerdeError(serde_json::Error),
     InvalidDirectory(PathBuf),
     FileNotFound(String),
+    InvalidDeduplicationReport(String),
 }
 
 impl From<io::Error> for AppError {
@@ -38,6 +39,9 @@ impl fmt::Display for AppError {
             AppError::FileNotFound(dir) => {
                 write!(f, "{} File `{}` not found", error_prefix, dir)
             }
+            AppError::InvalidDeduplicationReport(msg) => {
+                write!(f, "{} Invalid deduplication report: {}", error_prefix, msg)
+            }
         }
     }
 }
diff --git a/src/removal.rs b/src/removal.rs
@@ -8,8 +8,12 @@ use serde_json;
 /// Run the removal process for the given results file and creates the
 /// deduplicated output in the given output directory.
 pub fn run(results_file: &str, output_dir: &str) -> Result<(), AppError> {
-    let results_file = std::fs::read_to_string(results_file)?;
-    let results: DeduplicationReport = serde_json::from_str(&results_file)?;
+    let results_file = std::fs::read_to_string(results_file).map_err(
+        |_| AppError::FileNotFound(results_file.to_string()),
+    )?;
+    let results: DeduplicationReport = serde_json::from_str(&results_file).map_err(
+        |err| AppError::InvalidDeduplicationReport(err.to_string()),
+    )?;
 
     let output_dir = std::path::Path::new(output_dir);
     if !output_dir.exists() {