Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x

This commit is contained in:
James 2012-10-26 17:15:48 -04:00
parent f14320a769 c4f0491ff6
commit 375d70c99d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python_apps/media-monitor2/media/metadata/definitions.py
View File

@ -115,7 +115,7 @@ def load_definitions():
# 2. title is absent (read from file) # 2. title is absent (read from file)
# 3. recorded file # 3. recorded file
def tr_title(k): def tr_title(k):
unicode_unknown = u"unknown" #unicode_unknown = u"unknown"
new_title = u"" new_title = u""
if is_airtime_recorded(k) or k['title'] != u"": if is_airtime_recorded(k) or k['title'] != u"":
new_title = k['title'] new_title = k['title']
@ -124,16 +124,10 @@ def load_definitions():
default_title = re.sub(r'__\d+\.',u'.', default_title) default_title = re.sub(r'__\d+\.',u'.', default_title)
# format is: track_number-title-123kbps.mp3 # 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: if m: new_title = m.group('title')
if m.group('title') == unicode_unknown: new_title = '' else: new_title = re.sub(r'-\d+kbps$', u'', default_title)
else: new_title = m.group('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 return new_title
with md.metadata('MDATA_KEY_TITLE') as t: with md.metadata('MDATA_KEY_TITLE') as t: