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

CC-1799 Put Airtime Storage into a Human Readable File Naming Convention

Browse source 
changing ftype calculation to the python script.
This commit is contained in:
Naomi Aro 2011-06-14 18:52:43 +02:00
parent af4ec7b872
commit ff61972e82
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@ define('MDATA_KEY_CREATOR', 'artist_name');
define('MDATA_KEY_SOURCE', 'album_title'); define('MDATA_KEY_SOURCE', 'album_title');
define('MDATA_KEY_DURATION', 'length'); define('MDATA_KEY_DURATION', 'length');
define('MDATA_KEY_MIME', 'mime'); define('MDATA_KEY_MIME', 'mime');
define('MDATA_KEY_FTYPE', 'ftype');
define('MDATA_KEY_URL', 'url'); define('MDATA_KEY_URL', 'url');
define('MDATA_KEY_GENRE', 'genre'); define('MDATA_KEY_GENRE', 'genre');
define('MDATA_KEY_MOOD', 'mood'); define('MDATA_KEY_MOOD', 'mood');

12
airtime_mvc/application/models/StoredFile.php
View file

@ -40,7 +40,8 @@ class StoredFile {
"sample_rate" => "DbSampleRate", "sample_rate" => "DbSampleRate",
"mime" => "DbMime", "mime" => "DbMime",
"filepath" => "DbFilepath", "filepath" => "DbFilepath",
"md5" => "DbMd5" "md5" => "DbMd5",
"ftype" => "DbFtype"
); );
public function __construct() public function __construct()
@ -390,15 +391,6 @@ class StoredFile {
$storedFile->_file = $file; $storedFile->_file = $file;
if(isset($md)) { 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); $storedFile->setMetadata($md);
} }

7
python_apps/media-monitor/MediaMonitor.py
View file

@ -258,10 +258,15 @@ class MediaMonitor(ProcessEvent):
if key in attrs : if key in attrs :
md[attrs[key]] = file_info[key][0] 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_BITRATE'] = file_info.info.bitrate
md['MDATA_KEY_SAMPLERATE'] = file_info.info.sample_rate md['MDATA_KEY_SAMPLERATE'] = file_info.info.sample_rate
md['MDATA_KEY_DURATION'] = self.format_length(file_info.info.length) 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 return md