Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-3607: MediaFolder->deattaching the MediaFolder does not trigger the files 

be remover from server

- RecallByMd5() was checking against all cc_files entries which includes
 deleted files
This commit is contained in:
James 2012-04-12 17:37:14 -04:00
parent 56ceeded86
commit fd700c225c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
airtime_mvc/application/models/StoredFile.php
View File

@ -465,10 +465,12 @@ Logging::log("getting media! - 2");
* global unique id of file * global unique id of file
* @param string $p_md5sum * @param string $p_md5sum
* MD5 sum of the file * MD5 sum of the file
* @param boolean $exist
* When this is true, it check against only files with file_exist is 'true'
* @return Application_Model_StoredFile|NULL * @return Application_Model_StoredFile|NULL
* Return NULL if the object doesnt exist in the DB. * Return NULL if the object doesnt exist in the DB.
*/ */
public static function Recall($p_id=null, $p_gunid=null, $p_md5sum=null, $p_filepath=null) public static function Recall($p_id=null, $p_gunid=null, $p_md5sum=null, $p_filepath=null, $exist=false)
{ {
if (isset($p_id)) { if (isset($p_id)) {
$file = CcFilesQuery::create()->findPK(intval($p_id)); $file = CcFilesQuery::create()->findPK(intval($p_id));
@ -479,9 +481,16 @@ Logging::log("getting media! - 2");
->findOne(); ->findOne();
} }
else if (isset($p_md5sum)) { else if (isset($p_md5sum)) {
$file = CcFilesQuery::create() if($exist){
$file = CcFilesQuery::create()
->filterByDbMd5($p_md5sum)
->filterByDbFileExists(true)
->findOne();
}else{
$file = CcFilesQuery::create()
->filterByDbMd5($p_md5sum) ->filterByDbMd5($p_md5sum)
->findOne(); ->findOne();
}
} }
else if (isset($p_filepath)) { else if (isset($p_filepath)) {
$path_info = Application_Model_MusicDir::splitFilePath($p_filepath); $path_info = Application_Model_MusicDir::splitFilePath($p_filepath);
@ -536,9 +545,9 @@ Logging::log("getting media! - 2");
* @param string $p_md5sum * @param string $p_md5sum
* @return Application_Model_StoredFile|NULL * @return Application_Model_StoredFile|NULL
*/ */
public static function RecallByMd5($p_md5sum) public static function RecallByMd5($p_md5sum, $exist=false)
{ {
return Application_Model_StoredFile::Recall(null, null, $p_md5sum); return Application_Model_StoredFile::Recall(null, null, $p_md5sum, null, $exist);
} }
/** /**
@ -809,7 +818,7 @@ Logging::log("getting media! - 2");
$audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $tempname; $audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $tempname;
Logging::log('copyFileToStor: moving file '.$audio_file); Logging::log('copyFileToStor: moving file '.$audio_file);
$md5 = md5_file($audio_file); $md5 = md5_file($audio_file);
$duplicate = Application_Model_StoredFile::RecallByMd5($md5); $duplicate = Application_Model_StoredFile::RecallByMd5($md5, true);
$result = null; $result = null;
if ($duplicate) { if ($duplicate) {