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

CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format

Browse source 
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
This commit is contained in:
James 2012-04-13 17:45:28 -04:00
parent a6f44226b9
commit ffc17ba705
8 changed files with 86 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/application/models/MusicDir.php
View file

@ -175,7 +175,7 @@ class Application_Model_MusicDir {
if(!is_dir($p_path)){
return array("code"=>2, "error"=>"'$p_path' is not a valid directory.");
}
$real_path = realpath($p_path)."/";
$real_path = Application_Common_OsPath::normpath($p_path)."/";
if($real_path != "/"){
$p_path = $real_path;
}
@ -190,7 +190,7 @@ class Application_Model_MusicDir {
}
$dir->setType($p_type);
$p_path = realpath($p_path)."/";
$p_path = Application_Common_OsPath::normpath($p_path)."/";
try {
@ -245,7 +245,7 @@ class Application_Model_MusicDir {
//newly added watched directory object
$propel_new_watch = CcMusicDirsQuery::create()
->filterByDirectory(realpath($p_path)."/")
->filterByDirectory(Application_Common_OsPath::normpath($p_path)."/")
->findOne();
//any files of the deprecated "link" type.
@ -344,7 +344,7 @@ class Application_Model_MusicDir {
{
// we want to be consistent when storing dir path.
// path should always ends with trailing '/'
$p_dir = realpath($p_dir)."/";
$p_dir = Application_Common_OsPath::normpath($p_dir)."/";
if(!is_dir($p_dir)){
return array("code"=>2, "error"=>"'$p_dir' is not a valid directory.");
}else if(Application_Model_Preference::GetImportTimestamp()+10 > time()){
@ -396,7 +396,7 @@ class Application_Model_MusicDir {
* otherwise, it will set "Exists" flag to true
**/
public static function removeWatchedDir($p_dir, $userAddedWatchedDir=true){
$real_path = realpath($p_dir)."/";
$real_path = Application_Common_OsPath::normpath($p_dir)."/";
if($real_path != "/"){
$p_dir = $real_path;
}