diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index bebedaa0c..1a39ddb43 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -6,6 +6,7 @@ define('AIRTIME_API_VERSION', '1.0'); // Metadata Keys for files define('MDATA_KEY_FILEPATH', 'filepath'); +define('MDATA_KEY_DIRECTORY', 'directory'); define('MDATA_KEY_MD5', 'md5'); define('MDATA_KEY_TITLE', 'track_title'); define('MDATA_KEY_CREATOR', 'artist_name'); diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 8845583b6..c572e3ad2 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -217,7 +217,14 @@ class LibraryController extends Zend_Controller_Action $file = Application_Model_StoredFile::Recall($id); $this->view->type = $type; $md = $file->getMetadata(); - + + foreach ($md as $key => $value) { + if ($key == 'MDATA_KEY_DIRECTORY') { + $musicDir = Application_Model_MusicDir::getDirByPK($value); + $md['MDATA_KEY_FILEPATH'] = $musicDir->getDirectory() . $md['MDATA_KEY_FILEPATH']; + } + } + $formatter = new SamplerateFormatter($md["MDATA_KEY_SAMPLERATE"]); $md["MDATA_KEY_SAMPLERATE"] = $formatter->format(); diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 3270000d2..a832913b8 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -225,19 +225,7 @@ class Application_Model_StoredFile { foreach ($c['user'] as $constant => $value) { if (preg_match('/^MDATA_KEY/', $constant)) { if (isset($this->_dbMD[$value])) { - if ($value == 'filepath') { - $directoryPK = $this->getDbColMetadataValue('directory'); - if ($directoryPK == 1) { - $musicDir = Application_Model_MusicDir::getDirByPK($directoryPK); - $md[$constant] = $musicDir->getDirectory() . $this->getDbColMetadataValue($value); - } - else { - $md[$constant] = $this->getDbColMetadataValue($value); - } - } - else { - $md[$constant] = $this->getDbColMetadataValue($value); - } + $md[$constant] = $this->getDbColMetadataValue($value); } } }