Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-3634: Media Folder: if file was deleted from file system, and the file was

Browse source 
scheduled in the future, it wasn't getting deleted from AIrtime

- fixed
This commit is contained in:
James 2012-04-12 16:17:19 -04:00
parent 4ef18fb00f
commit 53e37ee826
3 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
airtime_mvc/application/models/StoredFile.php
View file

@ -286,14 +286,12 @@ class Application_Model_StoredFile {
{
$filepath = $this->getFilePath();
// Check if the file is scheduled to be played in the future
if (Application_Model_Schedule::IsFileScheduledInTheFuture($this->getId())) {
throw new DeleteScheduledFileException();
}
if (file_exists($filepath)) {
$data = array("filepath" => $filepath, "delete" => 1);
Application_Model_RabbitMq::SendMessageToMediaMonitor("file_delete", $data);
}
@ -301,11 +299,32 @@ class Application_Model_StoredFile {
if ($deleteFromPlaylist){
Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId());
}
// set file_exists falg to false
$this->_file->setDbFileExists(false);
$this->_file->save();
}
/**
* This function is for when media monitor detects deletion of file
* and trying to update airtime side
*
* @param boolean $p_deleteFile
*
*/
public function deleteByMediaMonitor($deleteFromPlaylist=false)
{
$filepath = $this->getFilePath();
if ($deleteFromPlaylist){
Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId());
}
// set file_exists falg to false
$this->_file->setDbFileExists(false);
$this->_file->save();
// delete entries in cc_schedule which has file_id as this file
Application_Model_Schedule::deleteWithFileId(self::getId());
}
/**
* Return suitable extension.