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

Merge branch 'cc-5709-airtime-analyzer' into saas

This commit is contained in:
Albert Santoni 2014-11-18 17:45:08 -05:00
parent cbb8ac7dc6 11a31375df
commit 4f7f64af7a
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
airtime_mvc/application/models/StoredFile.php
View File

@ -355,13 +355,8 @@ SQL;
{
$exists = false;
try {
//Explicitly check filepath because if it's blank, getFilePath() can
//still return a directory that exists.
if (!$this->_file->getDbFilepath()) {
$exists = false;
} else {
$exists = file_exists($this->getFilePath());
}
$filePath = $this->getFilePath();
$exists = (file_exists($this->getFilePath()) && !is_dir($filePath));
} catch (Exception $e) {
return false;
}
@ -504,11 +499,15 @@ SQL;
$music_dir = Application_Model_MusicDir::getDirByPK($this->
_file->getDbDirectory());
if (!$music_dir) {
throw new Exception("Invalid music_dir for file in database.");
throw new Exception(_("Invalid music_dir for file in database."));
}
$directory = $music_dir->getDirectory();
$filepath = $this->_file->getDbFilepath();
if (!$filepath) {
throw new Exception(sprintf(_("Blank file path for file %s (id: %s) in database."), $this->_file->getDbTrackTitle(), $this->getId()));
}
return Application_Common_OsPath::join($directory, $filepath);
}

3
airtime_mvc/application/modules/rest/controllers/MediaController.php
View File

@ -280,8 +280,7 @@ class Rest_MediaController extends Zend_Rest_Controller
{
return;
}
$id = $this->getId();
if (!$id) {
return;