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

cc-2419: media monitor import on startup

Browse source 
-fixed support for watched dirs
This commit is contained in:
martin 2011-07-04 17:37:05 -04:00
parent c67e711a05
commit df1dec2078
7 changed files with 38 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -521,8 +521,9 @@ class ApiController extends Zend_Controller_Action
print 'You are not allowed to access this resource.';
exit;
}
$dir_id = $request->getParam('dir_id');
$this->view->files = StoredFile::listAllFiles();
$this->view->files = StoredFile::listAllFiles($dir_id);
}
public function listAllWatchedDirsAction() {
@ -542,10 +543,10 @@ class ApiController extends Zend_Controller_Action
$arrWatchedDirs = MusicDir::getWatchedDirs();
$storDir = MusicDir::getStorDir();
$result[] = $storDir->getDirectory();
$result[$storDir->getId()] = $storDir->getDirectory();
foreach ($arrWatchedDirs as $watchedDir){
$result[] = $watchedDir->getDirectory();
$result[$watchedDir->getId()] = $watchedDir->getDirectory();
}
$this->view->dirs = $result;

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

@ -819,14 +819,15 @@ class StoredFile {
}
public static function listAllFiles(){
public static function listAllFiles($dir_id){
global $CC_CONFIG, $CC_DBC;
$sql = "SELECT m.directory || '/' || f.filepath as fp"
." FROM CC_MUSIC_DIRS m"
." LEFT JOIN CC_FILES f"
." ON m.id = f.directory"
." WHERE m.id = f.directory";
." WHERE m.id = f.directory"
." AND directory = $dir_id";
$rows = $CC_DBC->getAll($sql);
$results = array();