CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage.
-Remove unecessary "continue;" statements
This commit is contained in:
parent
29e24d1847
commit
d258e39b2e
|
@ -882,12 +882,10 @@ 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);
|
||||||
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);
|
||||||
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 +893,6 @@ 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);
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -906,7 +903,6 @@ 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);
|
||||||
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 +922,6 @@ class ApiController extends Zend_Controller_Action
|
||||||
if($watchDir){
|
if($watchDir){
|
||||||
Application_Model_MusicDir::removeWatchedDir($rd, false);
|
Application_Model_MusicDir::removeWatchedDir($rd, false);
|
||||||
}
|
}
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue