From 43fcc09f4f72166357ab3ccf63ea7cb9a5a25cee Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 13 May 2024 09:30:51 +0200 Subject: [PATCH] Feat : play.php output file or database deletion errors to user (#49) * Checks sqlite deletion before deleting file, error output * Restore initial logic * Update play.php * Update play.php * Readd output * Redirect err to output and parallelize deletions * Update play.php --- scripts/play.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/play.php b/scripts/play.php index bf6df3c..e310965 100644 --- a/scripts/play.php +++ b/scripts/play.php @@ -25,12 +25,15 @@ if(isset($_GET['deletefile'])) { ensure_db_ok($statement1); $statement1->bindValue(':file_name', explode("/", $_GET['deletefile'])[2]); $file_pointer = $home."/BirdSongs/Extracted/By_Date/".$_GET['deletefile']; - if (!exec("sudo rm $file_pointer && sudo rm $file_pointer.png")) { + if (!exec("sudo rm $file_pointer 2>&1 && sudo rm $file_pointer.png 2>&1", $output)) { echo "OK"; } else { - echo "Error"; + echo "Error - file deletion failed : " . implode(", ", $output); } $result1 = $statement1->execute(); + if ($result1 === false || $db_writable->changes() === 0) { + echo "Error - database line deletion failed : " . $db_writable->lastErrorMsg(); + } $db_writable->close(); die(); } @@ -171,7 +174,7 @@ function deleteDetection(filename,copylink=false) { location.reload(); } } else { - alert("Database busy.") + alert(this.responseText); } } xhttp.open("GET", "play.php?deletefile="+filename, true);