From 0a78605633616fb343dc8667714e9a7b811d42ae Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Fri, 24 Jun 2011 18:47:27 +0200 Subject: [PATCH] cc-1799 : Filesystem fixing track formatting if there's no track number. --- .../media-monitor/airtimefilemonitor/airtimemetadata.py | 2 ++ .../media-monitor/airtimefilemonitor/airtimeprocessevent.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py index f2f866994..6a0b1cdcb 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py @@ -102,6 +102,8 @@ class AirtimeMetadata: def get_md_from_file(self, filepath): + self.logger.info("getting info from filepath %s", filepath) + md = {} md5 = self.get_md5(filepath) md['MDATA_KEY_MD5'] = md5 diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py index 8a4cd6bd5..424b50ada 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py @@ -167,8 +167,9 @@ class AirtimeProcessEvent(ProcessEvent): else: md[m] = orig_md[m] - #make sure all track numbers are at least 2 digits long in the filepath. - md['MDATA_KEY_TRACKNUMBER'] = "%02d" % (int(md['MDATA_KEY_TRACKNUMBER'])) + if 'MDATA_KEY_TRACKNUMBER' in orig_md: + #make sure all track numbers are at least 2 digits long in the filepath. + md['MDATA_KEY_TRACKNUMBER'] = "%02d" % (int(md['MDATA_KEY_TRACKNUMBER'])) #format bitrate as 128kbps md['MDATA_KEY_BITRATE'] = str(md['MDATA_KEY_BITRATE']/1000)+"kbps"