From 2536c28a01c067619c37ccbd810f1a90d7c02d05 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 28 Aug 2012 17:51:48 -0400 Subject: [PATCH] MM2: more robust handling of bit rate --- python_apps/media-monitor2/media/monitor/pure.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index 97645a15b..25a0add28 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/python_apps/media-monitor2/media/monitor/pure.py @@ -14,8 +14,8 @@ from configobj import ConfigObj from media.monitor.exceptions import FailedToSetLocale, FailedToCreateDir -supported_extensions = [u"mp3", u"ogg", u"oga"] -#supported_extensions = [u"mp3", u"ogg", u"oga", u"flac", u"aac", u"bwf"] +#supported_extensions = [u"mp3", u"ogg", u"oga"] +supported_extensions = [u"mp3", u"ogg", u"oga", u"flac", u"aac", u"bwf"] unicode_unknown = u'unknown' path_md = ['MDATA_KEY_TITLE', 'MDATA_KEY_CREATOR', 'MDATA_KEY_SOURCE', @@ -285,11 +285,11 @@ def organized_path(old_path, root_path, orig_md): # MDATA_KEY_BITRATE is in bytes/second i.e. (256000) we want to turn this # into 254kbps normal_md = default_to_f(orig_md, path_md, unicode_unknown, default_f) - if normal_md['MDATA_KEY_BITRATE']: + try: formatted = str(int(normal_md['MDATA_KEY_BITRATE']) / 1000) normal_md['MDATA_KEY_BITRATE'] = formatted + 'kbps' - else: normal_md['MDATA_KEY_BITRATE'] = unicode_unknown - + except: + normal_md['MDATA_KEY_BITRATE'] = unicode_unknown if is_airtime_recorded(normal_md): title_re = re.match("(?P.+)-(?P\d+-\d+-\d+-\d+:\d+:\d+)$",