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

CC-5013:

Browse source 
Re-Added watched folder wont update

-fixed
This commit is contained in:
Martin Konecny 2013-05-10 13:19:56 -04:00
parent c36333ae07
commit 2250d89cbd
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/controllers/ApiController.php
View file

@ -632,7 +632,7 @@ class ApiController extends Zend_Controller_Action
$all = $request->getParam('all'); $all = $request->getParam('all');
$this->view->files = $this->view->files =
Application_Model_StoredFile::listAllFiles($dir_id,$all); Application_Model_StoredFile::listAllFiles($dir_id, $all);
} }
public function listAllWatchedDirsAction() public function listAllWatchedDirsAction()
@ -800,7 +800,7 @@ class ApiController extends Zend_Controller_Action
$watchDir = Application_Model_MusicDir::getDirByPath($rd); $watchDir = Application_Model_MusicDir::getDirByPath($rd);
// get all the files that is under $dirPath // get all the files that is under $dirPath
$files = Application_Model_StoredFile::listAllFiles( $files = Application_Model_StoredFile::listAllFiles(
$dir->getId(),$all=false, true); $dir->getId(),$all=false);
foreach ($files as $f) { foreach ($files as $f) {
// if the file is from this mount // if the file is from this mount
if (substr($f->getFilePath(), 0, strlen($rd)) === $rd) { if (substr($f->getFilePath(), 0, strlen($rd)) === $rd) {

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

@ -1071,7 +1071,7 @@ SQL;
* @param $dir_id - if this is not provided, it returns all files with full * @param $dir_id - if this is not provided, it returns all files with full
* path constructed. * path constructed.
*/ */
public static function listAllFiles($dir_id=null, $all) public static function listAllFiles($dir_id=null, $all=true)
{ {
$con = Propel::getConnection(); $con = Propel::getConnection();
@ -1081,10 +1081,6 @@ FROM CC_FILES AS f
WHERE f.directory = :dir_id WHERE f.directory = :dir_id
SQL; SQL;
# TODO : the option $all is deprecated now and is always true.
# refactor code where it's still being passed
$all = true;
if (!$all) { if (!$all) {
$sql .= " AND f.file_exists = 'TRUE'"; $sql .= " AND f.file_exists = 'TRUE'";
} }