🚑 fs::remove_dir_all is not idempotent

RemiBardon · Aug 8, 2024 · 7b40876 · 7b40876
1 parent 653b906
commit 7b40876
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/helpers/src/generate.rs b/src/helpers/src/generate.rs
@@ -361,7 +361,9 @@ pub fn trash_outdated_websites() -> Result<State, Error> {
     // NOTE: This whould not be necessary since the directory should be deleted
     //   but there might be edge cases where it's still there and the next
     //   `fs::rename` will fail if it's the case.
-    fs::remove_dir_all(TRASH_DIR.as_path())?;
+    if TRASH_DIR.exists() {
+        fs::remove_dir_all(TRASH_DIR.as_path())?;
+    }
 
     // Remove outdated websites
     fs::rename(DEST_DIR.as_path(), TRASH_DIR.as_path())?;

diff --git a/src/orangutan-server/Cargo.toml b/src/orangutan-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "orangutan-server"
-version = "0.4.8"
+version = "0.4.9"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html