added dry run skipping (#13)

Author: NikolaMilosa

Diff for: src/cli.rs

@@ -16,7 +16,7 @@ pub struct Cli {
 Outputs the contents of MFT found in the root of the volume and calculates what will be restored.
 "#
     )]
-    dry_run: bool,
+    pub dry_run: bool,
 
     #[arg(
         long,
@@ -25,7 +25,7 @@ Outputs the contents of MFT found in the root of the volume and calculates what
 The path to which the restored files will be written.
 "#
     )]
-    output_dir: PathBuf,
+    pub output_dir: PathBuf,
 
     #[arg(
         long,
@@ -34,39 +34,44 @@ The path to which the restored files will be written.
 The path to the image of file system to be restored that was retrieved with dd.
 "#
     )]
-    image: PathBuf,
-}
-
-pub struct CliParsed {
-    pub dry_run: bool,
-    pub output_dir: PathBuf,
     pub image: PathBuf,
 }
 
-impl CliParsed {
+impl Cli {
     pub fn display(&self) {
         info!("Configured with dry-run: {}", self.dry_run);
         info!("Configured with output-dir: {}", self.output_dir.display());
-        info!("Configured with volume: {}", self.image.display());
+        info!("Configured with image: {}", self.image.display());
     }
 
-    pub fn parse_and_validate(args: Cli) -> Result<Self, UndeleteError> {
-        if !args.image.exists() {
+    pub fn parse_and_validate(self) -> Result<Self, UndeleteError> {
+        if !self.image.exists() {
             return Err(UndeleteError::Parse(
-                "Specified volume is Non-existant!".to_string(),
+                "Specified image is Non-existant!".to_string(),
             ));
         }
 
-        Ok(args.into())
+        if !self.output_dir.exists() && !self.dry_run {
+            return Err(UndeleteError::Parse(
+                "Specified output directory is Non-existant!".to_string(),
+            ));
+        }
+
+        Ok(self)
     }
 }
 
-impl From<Cli> for CliParsed {
-    fn from(value: Cli) -> Self {
-        CliParsed {
-            dry_run: value.dry_run,
-            output_dir: value.output_dir,
-            image: value.image,
-        }
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_parse_and_validate_non_existant_image() {
+        let args = Cli::parse_and_validate(Cli {
+            dry_run: false,
+            image: PathBuf::from("non-existant/ntfs.dd"),
+            output_dir: PathBuf::from("src"),
+        });
+        assert!(args.is_err());
     }
 }

Diff for: src/main.rs

@@ -1,7 +1,7 @@
 use std::io::Read;
 
-use crate::cli::Cli;
 use clap::Parser;
+use cli::Cli;
 use dialoguer::MultiSelect;
 use errors::UndeleteError;
 use log::info;
@@ -19,7 +19,7 @@ fn main() -> Result<(), UndeleteError> {
         .filter_level(log::LevelFilter::Info)
         .init();
 
-    let args = cli::CliParsed::parse_and_validate(Cli::parse())?;
+    let args = cli::Cli::parse_and_validate(Cli::parse())?;
     args.display();
 
     let image_info = tsk::TskImg::from_utf8_sing(args.image.as_path()).map_err(|err| {
@@ -79,6 +79,11 @@ fn main() -> Result<(), UndeleteError> {
             ))
         })?;
 
+        if args.dry_run {
+            info!("Would write '{}' to disk", new_path.display());
+            continue;
+        }
+
         if std::fs::metadata(new_path.parent().unwrap()).is_err() {
             std::fs::create_dir_all(new_path.parent().unwrap()).map_err(|err| {
                 UndeleteError::General(format!(