From efd90d3bdf0c7d09e34b80303336824b727d0ae0 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Sun, 8 Mar 2026 21:40:33 -0600
Subject: [PATCH] refactor: add delete_dir utility and use across codebase

Adds a delete_dir helper that ignores NotFound errors (matching
the existing delete_file pattern) and replaces the repeated
metadata-check-then-remove_dir_all pattern throughout the codebase.
---
 core/src/backup/backup_bulk.rs |  4 +---
 core/src/disk/mount/backup.rs  |  4 +---
 core/src/init.rs               | 12 +++---------
 core/src/service/uninstall.rs  | 12 +++++-------
 core/src/setup.rs              |  4 +---
 core/src/util/io.rs            | 14 ++++++++++++++
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/core/src/backup/backup_bulk.rs b/core/src/backup/backup_bulk.rs
index 722498f3c..4c95bcad9 100644
--- a/core/src/backup/backup_bulk.rs
+++ b/core/src/backup/backup_bulk.rs
@@ -323,9 +323,7 @@ async fn perform_backup(
     os_backup_file.save().await?;
 
     let luks_folder_old = backup_guard.path().join("luks.old");
-    if tokio::fs::metadata(&luks_folder_old).await.is_ok() {
-        tokio::fs::remove_dir_all(&luks_folder_old).await?;
-    }
+    crate::util::io::delete_dir(&luks_folder_old).await?;
     let luks_folder_bak = backup_guard.path().join("luks");
     if tokio::fs::metadata(&luks_folder_bak).await.is_ok() {
         tokio::fs::rename(&luks_folder_bak, &luks_folder_old).await?;
diff --git a/core/src/disk/mount/backup.rs b/core/src/disk/mount/backup.rs
index 2c89981dc..f2b232ca0 100644
--- a/core/src/disk/mount/backup.rs
+++ b/core/src/disk/mount/backup.rs
@@ -53,9 +53,7 @@ impl<G: GenericMountGuard> BackupMountGuard<G> {
                         })?,
                 )?
             } else {
-                if tokio::fs::metadata(&crypt_path).await.is_ok() {
-                    tokio::fs::remove_dir_all(&crypt_path).await?;
-                }
+                crate::util::io::delete_dir(&crypt_path).await?;
                 Default::default()
             };
         let enc_key = if let (Some(hash), Some(wrapped_key)) = (
diff --git a/core/src/init.rs b/core/src/init.rs
index 8b6a91625..e5792adea 100644
--- a/core/src/init.rs
+++ b/core/src/init.rs
@@ -291,21 +291,15 @@ pub async fn init(
 
     init_tmp.start();
     let tmp_dir = Path::new(PACKAGE_DATA).join("tmp");
-    if tokio::fs::metadata(&tmp_dir).await.is_ok() {
-        tokio::fs::remove_dir_all(&tmp_dir).await?;
-    }
+    crate::util::io::delete_dir(&tmp_dir).await?;
     if tokio::fs::metadata(&tmp_dir).await.is_err() {
         tokio::fs::create_dir_all(&tmp_dir).await?;
     }
     let tmp_var = Path::new(PACKAGE_DATA).join("tmp/var");
-    if tokio::fs::metadata(&tmp_var).await.is_ok() {
-        tokio::fs::remove_dir_all(&tmp_var).await?;
-    }
+    crate::util::io::delete_dir(&tmp_var).await?;
     crate::disk::mount::util::bind(&tmp_var, "/var/tmp", false).await?;
     let downloading = Path::new(PACKAGE_DATA).join("archive/downloading");
-    if tokio::fs::metadata(&downloading).await.is_ok() {
-        tokio::fs::remove_dir_all(&downloading).await?;
-    }
+    crate::util::io::delete_dir(&downloading).await?;
     let tmp_docker = Path::new(PACKAGE_DATA).join("tmp").join(*CONTAINER_TOOL);
     crate::disk::mount::util::bind(&tmp_docker, *CONTAINER_DATADIR, false).await?;
     init_tmp.complete();
diff --git a/core/src/service/uninstall.rs b/core/src/service/uninstall.rs
index 2f6515024..ec8b92468 100644
--- a/core/src/service/uninstall.rs
+++ b/core/src/service/uninstall.rs
@@ -101,13 +101,11 @@ pub async fn cleanup(ctx: &RpcContext, id: &PackageId, soft: bool) -> Result<(),
 
             if !soft {
                 let path = Path::new(DATA_DIR).join(PKG_VOLUME_DIR).join(&manifest.id);
-                if tokio::fs::metadata(&path).await.is_ok() {
-                    tokio::fs::remove_dir_all(&path).await?;
-                }
-                let logs_dir = Path::new(PACKAGE_DATA).join("logs").join(&manifest.id);
-                if tokio::fs::metadata(&logs_dir).await.is_ok() {
-                    #[cfg(not(feature = "dev"))]
-                    tokio::fs::remove_dir_all(&logs_dir).await?;
+                crate::util::io::delete_dir(&path).await?;
+                #[cfg(not(feature = "dev"))]
+                {
+                    let logs_dir = Path::new(PACKAGE_DATA).join("logs").join(&manifest.id);
+                    crate::util::io::delete_dir(&logs_dir).await?;
                 }
             }
         },
diff --git a/core/src/setup.rs b/core/src/setup.rs
index 2166cfc08..850647752 100644
--- a/core/src/setup.rs
+++ b/core/src/setup.rs
@@ -738,9 +738,7 @@ async fn migrate(
     );
 
     let tmpdir = Path::new(package_data_transfer_args.0).join("tmp");
-    if tokio::fs::metadata(&tmpdir).await.is_ok() {
-        tokio::fs::remove_dir_all(&tmpdir).await?;
-    }
+    crate::util::io::delete_dir(&tmpdir).await?;
 
     let ordering = std::sync::atomic::Ordering::Relaxed;
 
diff --git a/core/src/util/io.rs b/core/src/util/io.rs
index 99940c373..f1478e8b0 100644
--- a/core/src/util/io.rs
+++ b/core/src/util/io.rs
@@ -1047,6 +1047,20 @@ pub async fn delete_file(path: impl AsRef<Path>) -> Result<(), Error> {
         .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("delete {path:?}")))
 }
 
+pub async fn delete_dir(path: impl AsRef<Path>) -> Result<(), Error> {
+    let path = path.as_ref();
+    tokio::fs::remove_dir_all(path)
+        .await
+        .or_else(|e| {
+            if e.kind() == std::io::ErrorKind::NotFound {
+                Ok(())
+            } else {
+                Err(e)
+            }
+        })
+        .with_ctx(|_| (ErrorKind::Filesystem, lazy_format!("delete dir {path:?}")))
+}
+
 #[instrument(skip_all)]
 pub async fn rename(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> Result<(), Error> {
     let src = src.as_ref();