From b14f2e894d6bf3f26a5911d4f26184ad9cd75477 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 2 Nov 2011 10:10:28 -0400 Subject: [PATCH 1/2] CC-3012: Media-monitor crash: "Exception: list index out of range" -fixed --- .../media-monitor/airtimefilemonitor/airtimemetadata.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py index 18edbc7c5..0247c0e6d 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py @@ -166,9 +166,9 @@ class AirtimeMetadata: #check if file has any metadata if file_info is not None: for key in file_info.keys() : - if key in self.mutagen2airtime : + if key in self.mutagen2airtime and len(file_info[key]) > 0: info = file_info[key][0] - while 1: + while True: temp = re.search(u"[\x80-\x9f]", info) if temp is not None: s = temp.group(0) From 5d0f36f130fc58cd1a3bcfe9d823e47b0eef83d2 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 2 Nov 2011 10:36:00 -0400 Subject: [PATCH 2/2] CC-3013: Media Monitor throws exception when trying to convert String to Int. -fixed -also specified base 10 radix --- .../media-monitor/airtimefilemonitor/airtimemetadata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py index 0247c0e6d..17c97259e 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py @@ -197,9 +197,9 @@ class AirtimeMetadata: if isinstance(md['MDATA_KEY_TRACKNUMBER'], basestring): match = re.search('^(\d*/\d*)?', md['MDATA_KEY_TRACKNUMBER']) - if match.group(0) is not u'': - md['MDATA_KEY_TRACKNUMBER'] = int(md['MDATA_KEY_TRACKNUMBER'].split("/")[0]) - else: + try: + md['MDATA_KEY_TRACKNUMBER'] = int(md['MDATA_KEY_TRACKNUMBER'].split("/")[0], 10) + except Exception, e: del md['MDATA_KEY_TRACKNUMBER'] #make sure bpm is valid, need to check more types of formats for this tag to assure correct parsing.