From 12e4585410ae1a59acf0f6213f06691eb7eb4a28 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 21 Aug 2012 14:07:26 -0400 Subject: [PATCH] MM2: formatted some code --- python_apps/media-monitor2/media/monitor/pure.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index 4d768b0f8..89c859ace 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/python_apps/media-monitor2/media/monitor/pure.py @@ -274,20 +274,24 @@ def organized_path(old_path, root_path, orig_md): if key in dictionary: return len(dictionary[key]) == 0 else: return True # We set some metadata elements to a default "unknown" value because we use - # these fields to create a path hence they cannot be empty - # Here "normal" means normalized only for organized path + # these fields to create a path hence they cannot be empty Here "normal" + # means normalized only for organized path + + # 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']: formatted = str(int(normal_md['MDATA_KEY_BITRATE']) / 1000) normal_md['MDATA_KEY_BITRATE'] = formatted + 'kbps' else: normal_md['MDATA_KEY_BITRATE'] = unicode_unknown + if is_airtime_recorded(normal_md): title_re = re.match("(?P\w+)-(?P\d+-\d+-\d+-\d+:\d+:\d+)$", normal_md['MDATA_KEY_TITLE']) - show_name, = title_re.group('show'), - date = title_re.group('date').replace(':','-') + show_name, = title_re.group('show'), + date = title_re.group('date').replace(':','-') yyyy, mm, _ = normal_md['MDATA_KEY_YEAR'].split('-',2) - fname_base = '%s-%s-%s.%s' % \ + fname_base = '%s-%s-%s.%s' % \ (date, show_name, normal_md['MDATA_KEY_BITRATE'], ext) filepath = os.path.join(root_path, yyyy, mm, fname_base) elif len(normal_md['MDATA_KEY_TRACKNUMBER']) == 0: