🚑 Fix trash not emptied in some cases

RemiBardon · Aug 8, 2024 · 990385b · 990385b
1 parent 31bace9
commit 990385b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 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
@@ -357,6 +357,12 @@ pub fn create_tmp_dir() -> Result<(), Error> {
 pub fn trash_outdated_websites() -> Result<State, Error> {
     trace!("Trashing outdated websites…");
 
+    // Empty the trash (it's at least `HEAD~2` so we can safely delete it)
+    // 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())?;
+
     // 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.6"
+version = "0.4.7"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html