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
This commit is contained in:
Alexandre
2024-05-13 09:30:51 +02:00
committed by GitHub
parent befda17bd4
commit 43fcc09f4f
+6 -3
View File
@@ -25,12 +25,15 @@ if(isset($_GET['deletefile'])) {
ensure_db_ok($statement1); ensure_db_ok($statement1);
$statement1->bindValue(':file_name', explode("/", $_GET['deletefile'])[2]); $statement1->bindValue(':file_name', explode("/", $_GET['deletefile'])[2]);
$file_pointer = $home."/BirdSongs/Extracted/By_Date/".$_GET['deletefile']; $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"; echo "OK";
} else { } else {
echo "Error"; echo "Error - file deletion failed : " . implode(", ", $output);
} }
$result1 = $statement1->execute(); $result1 = $statement1->execute();
if ($result1 === false || $db_writable->changes() === 0) {
echo "Error - database line deletion failed : " . $db_writable->lastErrorMsg();
}
$db_writable->close(); $db_writable->close();
die(); die();
} }
@@ -171,7 +174,7 @@ function deleteDetection(filename,copylink=false) {
location.reload(); location.reload();
} }
} else { } else {
alert("Database busy.") alert(this.responseText);
} }
} }
xhttp.open("GET", "play.php?deletefile="+filename, true); xhttp.open("GET", "play.php?deletefile="+filename, true);