Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-3747: Metadata popup should also show the filepath of the track 

-fixed
This commit is contained in:
denise 2012-05-02 16:52:49 -04:00
parent 0d5b9ebada
commit ff6e2a2e5a
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/configs/constants.php
View File

@ -6,6 +6,7 @@ define('AIRTIME_API_VERSION', '1.0');
// Metadata Keys for files // Metadata Keys for files
define('MDATA_KEY_FILEPATH', 'filepath'); define('MDATA_KEY_FILEPATH', 'filepath');
define('MDATA_KEY_DIRECTORY', 'directory');
define('MDATA_KEY_MD5', 'md5'); define('MDATA_KEY_MD5', 'md5');
define('MDATA_KEY_TITLE', 'track_title'); define('MDATA_KEY_TITLE', 'track_title');
define('MDATA_KEY_CREATOR', 'artist_name'); define('MDATA_KEY_CREATOR', 'artist_name');

9
airtime_mvc/application/controllers/LibraryController.php
View File

@ -217,7 +217,14 @@ class LibraryController extends Zend_Controller_Action
$file = Application_Model_StoredFile::Recall($id); $file = Application_Model_StoredFile::Recall($id);
$this->view->type = $type; $this->view->type = $type;
$md = $file->getMetadata(); $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"]); $formatter = new SamplerateFormatter($md["MDATA_KEY_SAMPLERATE"]);
$md["MDATA_KEY_SAMPLERATE"] = $formatter->format(); $md["MDATA_KEY_SAMPLERATE"] = $formatter->format();

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

@ -225,19 +225,7 @@ class Application_Model_StoredFile {
foreach ($c['user'] as $constant => $value) { foreach ($c['user'] as $constant => $value) {
if (preg_match('/^MDATA_KEY/', $constant)) { if (preg_match('/^MDATA_KEY/', $constant)) {
if (isset($this->_dbMD[$value])) { if (isset($this->_dbMD[$value])) {
if ($value == 'filepath') { $md[$constant] = $this->getDbColMetadataValue($value);
$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);
}
} }
} }
} }