Fix unpacking with merge flag failing without --dir flag (#826)

Signed-off-by: tommady <[email protected]>

Author: tommady

CHANGELOG.md

@@ -37,6 +37,7 @@ Categories Used:
 
 - Fix tar extraction count when --quiet [\#824](https://github.com/ouch-org/ouch/pull/824) ([marcospb19](https://github.com/marcospb19))
 - Fix 7z BadSignature error when compressing and then listing [\#819](https://github.com/ouch-org/ouch/pull/819) ([tommady](https://github.com/tommady))
+- Fix unpacking with merge flag failing without --dir flag [\#826](https://github.com/ouch-org/ouch/pull/826) ([tommady](https://github.com/tommady))
 
 ### Tweaks
 

src/commands/decompress.rs

@@ -413,7 +413,9 @@ fn smart_unpack(
     };
 
     // Rename the temporary directory to the archive name, which is output_file_path
-    fs::rename(&previous_path, &new_path)?;
+    if fs::rename(&previous_path, &new_path).is_err() {
+        utils::rename_recursively(&previous_path, &new_path)?;
+    };
     info_accessible(format!(
         "Successfully moved \"{}\" to \"{}\"",
         nice_directory_display(&previous_path),

src/utils/fs.rs

@@ -209,3 +209,23 @@ pub fn try_infer_extension(path: &Path) -> Option<Extension> {
         None
     }
 }
+
+/// Rename the src directory into the dst directory recursively
+pub fn rename_recursively(src: &Path, dst: &Path) -> crate::Result<()> {
+    if !src.exists() || !dst.exists() {
+        return Err(crate::Error::NotFound {
+            error_title: "source or destination directory does not exist".to_string(),
+        });
+    }
+
+    for entry in fs::read_dir(src)? {
+        let entry = entry?;
+        let ty = entry.file_type()?;
+        if ty.is_dir() {
+            rename_recursively(entry.path().as_path(), dst.join(entry.file_name()).as_path())?;
+        } else {
+            fs::rename(entry.path(), dst.join(entry.file_name()).as_path())?;
+        }
+    }
+    Ok(())
+}

src/utils/mod.rs

@@ -19,7 +19,7 @@ pub use self::{
     },
     fs::{
         cd_into_same_dir_as, create_dir_if_non_existent, is_path_stdin, remove_file_or_dir,
-        rename_for_available_filename, resolve_path_conflict, try_infer_extension,
+        rename_for_available_filename, rename_recursively, resolve_path_conflict, try_infer_extension,
     },
     question::{
         ask_to_create_file, user_wants_to_continue, user_wants_to_overwrite, FileConflitOperation, QuestionAction,