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

CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. Attempt to 

play unavailable track leads to platform hanging

- in cast of mount/unmoun drive has some nested folder that were already in the
cc_music_dirs table, airtime was only setting true/false flag on only one of
the entry.
This commit is contained in:
James 2012-04-13 17:18:31 -04:00
parent 3ae8eb9105
commit 9cafc91785
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
airtime_mvc/application/controllers/ApiController.php
View File

@ -882,12 +882,12 @@ class ApiController extends Zend_Controller_Action
// if mount path itself was watched // if mount path itself was watched
if($dirPath == $ad){ if($dirPath == $ad){
Application_Model_MusicDir::addWatchedDir($dirPath, false); Application_Model_MusicDir::addWatchedDir($dirPath, false);
break; continue;
} }
// if dir contains any dir in removed_list( if watched dir resides on new mounted path ) // if dir contains any dir in removed_list( if watched dir resides on new mounted path )
else if(substr($dirPath, 0, strlen($ad)) === $ad && $dir->getExistsFlag() == false){ else if(substr($dirPath, 0, strlen($ad)) === $ad && $dir->getExistsFlag() == false){
Application_Model_MusicDir::addWatchedDir($dirPath, false); Application_Model_MusicDir::addWatchedDir($dirPath, false);
break; continue;
} }
// is new mount point within the watched dir? // is new mount point within the watched dir?
// pyinotify doesn't notify anyhing in this case, so we add this mount point as // pyinotify doesn't notify anyhing in this case, so we add this mount point as
@ -895,7 +895,7 @@ class ApiController extends Zend_Controller_Action
else if(substr($ad, 0, strlen($dirPath)) === $dirPath){ else if(substr($ad, 0, strlen($dirPath)) === $dirPath){
// bypass nested loop check // bypass nested loop check
Application_Model_MusicDir::addWatchedDir($ad, false, true); Application_Model_MusicDir::addWatchedDir($ad, false, true);
break; continue;
} }
} }
} }
@ -906,7 +906,7 @@ class ApiController extends Zend_Controller_Action
// if dir contains any dir in removed_list( if watched dir resides on new mounted path ) // if dir contains any dir in removed_list( if watched dir resides on new mounted path )
if(substr($dirPath, 0, strlen($rd)) === $rd && $dir->getExistsFlag() == true){ if(substr($dirPath, 0, strlen($rd)) === $rd && $dir->getExistsFlag() == true){
Application_Model_MusicDir::removeWatchedDir($dirPath, false); Application_Model_MusicDir::removeWatchedDir($dirPath, false);
break; continue;
} }
// is new mount point within the watched dir? // is new mount point within the watched dir?
// pyinotify doesn't notify anyhing in this case, so we walk through all files within // pyinotify doesn't notify anyhing in this case, so we walk through all files within
@ -926,7 +926,7 @@ class ApiController extends Zend_Controller_Action
if($watchDir){ if($watchDir){
Application_Model_MusicDir::removeWatchedDir($rd, false); Application_Model_MusicDir::removeWatchedDir($rd, false);
} }
break; continue;
} }
} }
} }