From ff61972e82382db5d0ffa8baf70399fb6d107a7a Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 14 Jun 2011 18:52:43 +0200 Subject: [PATCH] CC-1799 Put Airtime Storage into a Human Readable File Naming Convention changing ftype calculation to the python script. --- airtime_mvc/application/configs/constants.php | 1 + airtime_mvc/application/models/StoredFile.php | 12 ++---------- python_apps/media-monitor/MediaMonitor.py | 7 ++++++- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index dcb381b43..df5ef7741 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -12,6 +12,7 @@ define('MDATA_KEY_CREATOR', 'artist_name'); define('MDATA_KEY_SOURCE', 'album_title'); define('MDATA_KEY_DURATION', 'length'); define('MDATA_KEY_MIME', 'mime'); +define('MDATA_KEY_FTYPE', 'ftype'); define('MDATA_KEY_URL', 'url'); define('MDATA_KEY_GENRE', 'genre'); define('MDATA_KEY_MOOD', 'mood'); diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index a9a5d82ff..3cafb1640 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -40,7 +40,8 @@ class StoredFile { "sample_rate" => "DbSampleRate", "mime" => "DbMime", "filepath" => "DbFilepath", - "md5" => "DbMd5" + "md5" => "DbMd5", + "ftype" => "DbFtype" ); public function __construct() @@ -390,15 +391,6 @@ class StoredFile { $storedFile->_file = $file; if(isset($md)) { - if(isset($md['MDATA_KEY_MIME'])) { - if (preg_match("/mp3/i", $md['MDATA_KEY_MIME'])) { - $file->setDbFtype("audioclip"); - } - else if (preg_match("/vorbis/i", $md['MDATA_KEY_MIME'])) { - $file->setDbFtype("audioclip"); - } - } - $storedFile->setMetadata($md); } diff --git a/python_apps/media-monitor/MediaMonitor.py b/python_apps/media-monitor/MediaMonitor.py index 02fd21b71..46c167cd2 100644 --- a/python_apps/media-monitor/MediaMonitor.py +++ b/python_apps/media-monitor/MediaMonitor.py @@ -258,10 +258,15 @@ class MediaMonitor(ProcessEvent): if key in attrs : md[attrs[key]] = file_info[key][0] - md['MDATA_KEY_MIME'] = file_info.mime[0] md['MDATA_KEY_BITRATE'] = file_info.info.bitrate md['MDATA_KEY_SAMPLERATE'] = file_info.info.sample_rate md['MDATA_KEY_DURATION'] = self.format_length(file_info.info.length) + md['MDATA_KEY_MIME'] = file_info.mime[0] + + if "mp3" in md['MDATA_KEY_MIME']: + md['MDATA_KEY_FTYPE'] = "audioclip" + elif "vorbis" in md['MDATA_KEY_MIME']: + md['MDATA_KEY_FTYPE'] = "audioclip" return md