From ba8edcb4eee6b939e68fb806f17b2604c491f963 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre+tmp@gmail.com>
Date: Fri, 29 Nov 2024 22:50:15 -0500
Subject: [PATCH] Fix wipe command leaving database in inconsistent state if
 lock acquisition fails

---
 cli/src/main.rs | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/cli/src/main.rs b/cli/src/main.rs
index f05a24d..38bfa85 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -735,29 +735,35 @@ fn wipe() -> Result<(), CliError> {
         std::process::exit(1)
     };
 
-    let data_dir = data_dir();
-    let mut tmp_data_dir = data_dir.with_extension("tmp");
-    match fs::rename(&data_dir, &tmp_data_dir) {
-        Err(e) if e.kind() == ErrorKind::NotFound => {
-            println!("Nothing to delete");
-            return Ok(());
-        }
-        r => r,
-    }
-    .map_io_err(|| format!("Failed to rename dir: {data_dir:?} -> {tmp_data_dir:?}"))?;
+    let mut data_dir = data_dir();
+
+    data_dir.push(".nuke.server.lock");
+    let mut extra_buffer = data_dir.clone();
+    data_dir.pop();
 
-    tmp_data_dir.push("server.lock");
+    data_dir.push("server.lock");
     acquire_lock_file(
         &mut false,
         CWD,
-        tmp_data_dir.parent().unwrap(),
-        &tmp_data_dir.with_file_name(".nuke.server.lock"),
-        &tmp_data_dir,
+        data_dir.parent().unwrap(),
+        &extra_buffer,
+        &data_dir,
         SendQuitAndWait,
     )?;
-    tmp_data_dir.pop();
+    data_dir.pop();
+
+    extra_buffer.pop();
+    extra_buffer.set_extension("tmp");
+    match fs::rename(&data_dir, &extra_buffer) {
+        Err(e) if e.kind() == ErrorKind::NotFound => {
+            println!("Nothing to delete");
+            return Ok(());
+        }
+        r => r,
+    }
+    .map_io_err(|| format!("Failed to rename dir: {data_dir:?} -> {extra_buffer:?}"))?;
 
-    fuc_engine::remove_dir_all(tmp_data_dir)?;
+    fuc_engine::remove_dir_all(extra_buffer)?;
     println!("Wiped.");
 
     Ok(())