Make dequeuing posts also delete the backup.

Kansattica · Mar 5, 2021 · 7dcc308 · 7dcc308
1 parent 4a4aca6
commit 7dcc308
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/lib/queue/queues.cpp b/lib/queue/queues.cpp
@@ -258,7 +258,14 @@ void enqueue(const api_route toenqueue, const fs::path& user_account_dir, std::v
 
 void dequeue_post(const fs::path& queuedir, const fs::path& filename)
 {
-	if (!fs::remove(queuedir / filename))
+	auto todelete = queuedir / filename;
+	if (!fs::remove(todelete))
+	{
+		pl() << "Could not delete " << filename << ", could not find it in " << to_utf8(queuedir) << '\n';
+	}
+
+	todelete.concat(".bak");
+	if (!fs::remove(todelete))
 	{
 		pl() << "Could not delete " << filename << ", could not find it in " << to_utf8(queuedir) << '\n';
 	}

diff --git a/tests/queues.cpp b/tests/queues.cpp
@@ -185,9 +185,11 @@ SCENARIO("Queues correctly enqueue and dequeue posts.")
 				dequeue(api_route::post, accountdir, std::move(toq));
 
 				CAPTURE(justfilename);
-				THEN("msync's copy of the post is deleted")
+				THEN("msync's copy and backup of the post are deleted")
 				{
-					REQUIRE_FALSE(fs::exists(file_queue_dir / justfilename));
+					auto filepath = file_queue_dir / justfilename;
+					REQUIRE_FALSE(fs::exists(filepath));
+					REQUIRE_FALSE(fs::exists(filepath.concat(".bak")));
 				}
 
 				THEN("the original copy of the post is fine")
@@ -326,9 +328,11 @@ SCENARIO("Queues correctly enqueue and dequeue posts.")
 
 				dequeue(api_route::post, accountdir, std::vector<std::string> { thisfile });
 
-				THEN("msync's copy of the dequeued file is deleted.")
+				THEN("msync's copy and backup of the dequeued file are deleted.")
 				{
-					REQUIRE_FALSE(fs::exists(file_queue_dir / thisfile));
+					auto filepath = file_queue_dir / thisfile;
+					REQUIRE_FALSE(fs::exists(filepath));
+					REQUIRE_FALSE(fs::exists(filepath.concat(".bak")));
 				}
 
 				THEN("msync's copy of the other file is still there.")
@@ -426,9 +430,11 @@ SCENARIO("Queues correctly enqueue and dequeue posts.")
 
 				dequeue(api_route::post, accountdir, std::vector<std::string> { thisfile });
 
-				THEN("msync's copy of the dequeued file is deleted.")
-				{
-					REQUIRE_FALSE(fs::exists(file_queue_dir / thisfile));
+				THEN("msync's copy of the dequeued file and its backup are deleted.")
+				{ 
+					auto filepath = file_queue_dir / thisfile;
+					REQUIRE_FALSE(fs::exists(filepath));
+					REQUIRE_FALSE(fs::exists(filepath.concat(".bak")));
 				}
 
 				THEN("msync's copy of the other file is still there.")