refactor(client-cli): only remove contents of the ledger directory, not the directory itself

Author: dlachaume

mithril-client-cli/src/commands/tools/snapshot_converter.rs

@@ -11,8 +11,8 @@ use clap::{Parser, ValueEnum};
 use mithril_client::MithrilResult;
 
 use crate::utils::{
-    copy_dir, ArchiveUnpacker, GitHubReleaseRetriever, HttpDownloader, ReqwestGitHubApiClient,
-    ReqwestHttpDownloader,
+    copy_dir, remove_dir_contents, ArchiveUnpacker, GitHubReleaseRetriever, HttpDownloader,
+    ReqwestGitHubApiClient, ReqwestHttpDownloader,
 };
 
 const GITHUB_ORGANIZATION: &str = "IntersectMBO";
@@ -403,15 +403,9 @@ impl SnapshotConverterCommand {
         let (slot_number, _) = filename
             .split_once('_')
             .ok_or_else(|| anyhow!("Invalid converted snapshot name format: {}", filename))?;
-        remove_dir_all(&ledger_dir).with_context(|| {
+        remove_dir_contents(&ledger_dir).with_context(|| {
             format!(
-                "Failed to remove old ledger state snapshot directory: {}",
-                ledger_dir.display()
-            )
-        })?;
-        create_dir(&ledger_dir).with_context(|| {
-            format!(
-                "Failed to recreate ledger state snapshot directory: {}",
+                "Failed to remove contents of ledger directory: {}",
                 ledger_dir.display()
             )
         })?;

mithril-client-cli/src/utils/fs.rs

@@ -48,6 +48,26 @@ fn copy_dir_contents(source_dir: &Path, target_dir: &Path) -> MithrilResult<()>
     Ok(())
 }
 
+/// Removes all contents inside the given directory.
+pub fn remove_dir_contents(dir: &Path) -> MithrilResult<()> {
+    if !dir.exists() {
+        return Ok(());
+    }
+
+    for entry in fs::read_dir(dir)? {
+        let path = entry?.path();
+        if path.is_dir() {
+            fs::remove_dir_all(&path)
+                .with_context(|| format!("Failed to remove subdirectory: {}", path.display()))?;
+        } else {
+            fs::remove_file(&path)
+                .with_context(|| format!("Failed to remove file: {}", path.display()))?;
+        }
+    }
+
+    Ok(())
+}
+
 #[cfg(test)]
 mod tests {
     use std::fs::File;
@@ -106,4 +126,20 @@ mod tests {
             ** root.txt"
         );
     }
+
+    #[test]
+    fn cleans_directory_without_deleting_it() {
+        let dir = temp_dir_create!().join("dir_to_clean");
+        fs::create_dir(&dir).unwrap();
+
+        File::create(dir.join("file1.txt")).unwrap();
+        let sub_dir = dir.join("subdir");
+        fs::create_dir(&sub_dir).unwrap();
+        File::create(sub_dir.join("file2.txt")).unwrap();
+
+        remove_dir_contents(&dir).unwrap();
+
+        assert!(dir.exists());
+        assert!(fs::read_dir(&dir).unwrap().next().is_none());
+    }
 }