diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index ce2f36c86..67efa7638 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -151,6 +151,7 @@ class LibraryController extends Zend_Controller_Action return; } else { + $res = settype($res, "integer"); $data = array("filepath" => $file->getFilePath(), "delete" => $res); RabbitMq::SendMessageToMediaMonitor("file_delete", $data); } diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index aa711094d..90754b0b6 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -318,6 +318,8 @@ class StoredFile { Playlist::DeleteFileFromAllPlaylists($this->getId()); $this->_file->delete(); + + return $res; } /** diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py index 3af4ac541..acbe3602b 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py @@ -112,7 +112,7 @@ class AirtimeNotifier(Notifier): self.logger.info("Adding file to ignore: %s ", filepath) mm.add_filepath_to_ignore(filepath) - if m['delete'] == "true": + if m['delete']: self.logger.info("Deleting file: %s ", filepath) os.unlink(filepath)