Delete archive error handling (#886)

* Fix delete archive error toast not appearing due to type fuckery * Check if archive file is actually deleted * Update lib/LANraragi/Utils/Database.pm --------- Co-authored-by: Difegue <[email protected]>
Difegue · Nov 1, 2023 · cb4d1f9 · cb4d1f9
1 parent 53ab3fb
commit cb4d1f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/LANraragi/Utils/Database.pm b/lib/LANraragi/Utils/Database.pm
@@ -234,7 +234,7 @@ sub delete_archive ($id) {
     update_indexes( $id, $oldtags, "" );
 
     if ( -e $filename ) {
-        unlink $filename;
+        my $status = unlink $filename;
 
         my $thumbdir  = LANraragi::Model::Config->get_thumbdir;
         my $subfolder = substr( $id, 0, 2 );
@@ -248,7 +248,7 @@ sub delete_archive ($id) {
         # Delete the thumbpages folder
         remove_tree("$thumbdir/$subfolder/$id/");
 
-        return $filename;
+        return $status ? $filename : "0";
     }
 
     return "0";

diff --git a/public/js/server.js b/public/js/server.js
@@ -284,7 +284,7 @@ Server.deleteArchive = function (arcId, callback) {
     fetch(`/api/archives/${arcId}`, { method: "DELETE" })
         .then((response) => (response.ok ? response.json() : { success: 0, error: "Response was not OK" }))
         .then((data) => {
-            if (data.success === "0") {
+            if (!data.success) {
                 LRR.toast({
                     heading: "Couldn't delete archive file. <br> (Maybe it has already been deleted beforehand?)",
                     text: "Archive metadata has been deleted properly. <br> Please delete the file manually before returning to Library View.",