From 7cd8541696372bb15e83d64f1c46686d72b7fa80 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 26 Oct 2012 16:41:29 -0400 Subject: [PATCH 1/4] cc-4635: Fix --- python_apps/media-monitor2/media/metadata/definitions.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/python_apps/media-monitor2/media/metadata/definitions.py b/python_apps/media-monitor2/media/metadata/definitions.py index c53d091f3..0e7282b20 100644 --- a/python_apps/media-monitor2/media/metadata/definitions.py +++ b/python_apps/media-monitor2/media/metadata/definitions.py @@ -124,16 +124,12 @@ def load_definitions(): default_title = re.sub(r'__\d+\.',u'.', default_title) # format is: track_number-title-123kbps.mp3 - m = re.match(".+-(?P.+)-\d+kbps", default_title) + m = re.match(".+-(?P<title>.+)-\d+kbps$", default_title) if m: if m.group('title') == unicode_unknown: new_title = '' else: new_title = m.group('title') + else: new_title = re.sub(r'-\d+kbps$', u'', new_title) - if re.match(".+-%s-.+$" % unicode_unknown, default_title): - default_title = u'' - - new_title = default_title - new_title = re.sub(r'-\d+kbps$', u'', new_title) return new_title with md.metadata('MDATA_KEY_TITLE') as t: From e10f81aec85b77a327aa7938fea1c90340103fb8 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg <rudi.grinberg@sourcefabric.org> Date: Fri, 26 Oct 2012 16:48:03 -0400 Subject: [PATCH 2/4] cc-4635: Fix --- python_apps/media-monitor2/media/metadata/definitions.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/python_apps/media-monitor2/media/metadata/definitions.py b/python_apps/media-monitor2/media/metadata/definitions.py index 0e7282b20..a6d8221df 100644 --- a/python_apps/media-monitor2/media/metadata/definitions.py +++ b/python_apps/media-monitor2/media/metadata/definitions.py @@ -115,7 +115,7 @@ def load_definitions(): # 2. title is absent (read from file) # 3. recorded file def tr_title(k): - unicode_unknown = u"unknown" + #unicode_unknown = u"unknown" new_title = u"" if is_airtime_recorded(k) or k['title'] != u"": new_title = k['title'] @@ -125,9 +125,7 @@ def load_definitions(): # format is: track_number-title-123kbps.mp3 m = re.match(".+-(?P<title>.+)-\d+kbps$", default_title) - if m: - if m.group('title') == unicode_unknown: new_title = '' - else: new_title = m.group('title') + if m: new_title = m.group('title') else: new_title = re.sub(r'-\d+kbps$', u'', new_title) return new_title From 72928bb5e65f1a7ab68212a2f71b2cd15b05ca92 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg <rudi.grinberg@sourcefabric.org> Date: Fri, 26 Oct 2012 16:59:32 -0400 Subject: [PATCH 3/4] cc-4635: Fix --- python_apps/media-monitor2/media/metadata/definitions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/media-monitor2/media/metadata/definitions.py b/python_apps/media-monitor2/media/metadata/definitions.py index a6d8221df..31d28b563 100644 --- a/python_apps/media-monitor2/media/metadata/definitions.py +++ b/python_apps/media-monitor2/media/metadata/definitions.py @@ -126,7 +126,7 @@ def load_definitions(): # format is: track_number-title-123kbps.mp3 m = re.match(".+-(?P<title>.+)-\d+kbps$", default_title) if m: new_title = m.group('title') - else: new_title = re.sub(r'-\d+kbps$', u'', new_title) + else: new_title = re.sub(r'-\d+kbps$', u'', default_title) return new_title From c4f0491ff643ca8b17038118c41be32123e15255 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg <rudi.grinberg@sourcefabric.org> Date: Fri, 26 Oct 2012 17:04:42 -0400 Subject: [PATCH 4/4] cc-4635: Fix --- python_apps/media-monitor2/media/metadata/definitions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/media-monitor2/media/metadata/definitions.py b/python_apps/media-monitor2/media/metadata/definitions.py index 31d28b563..9919eb041 100644 --- a/python_apps/media-monitor2/media/metadata/definitions.py +++ b/python_apps/media-monitor2/media/metadata/definitions.py @@ -124,7 +124,7 @@ def load_definitions(): default_title = re.sub(r'__\d+\.',u'.', default_title) # format is: track_number-title-123kbps.mp3 - m = re.match(".+-(?P<title>.+)-\d+kbps$", default_title) + m = re.match(".+-(?P<title>.+)-(\d+kbps|unknown)$", default_title) if m: new_title = m.group('title') else: new_title = re.sub(r'-\d+kbps$', u'', default_title)