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

cc-4305: Fixed bug + added test.

This commit is contained in:
Rudi Grinberg 2012-08-28 11:54:35 -04:00
parent 03015ac89c
commit a276e1c2c6
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python_apps/media-monitor2/media/monitor/pure.py
View File

@ -290,8 +290,9 @@ def organized_path(old_path, root_path, orig_md):
normal_md['MDATA_KEY_BITRATE'] = formatted + 'kbps' normal_md['MDATA_KEY_BITRATE'] = formatted + 'kbps'
else: normal_md['MDATA_KEY_BITRATE'] = unicode_unknown else: normal_md['MDATA_KEY_BITRATE'] = unicode_unknown
if is_airtime_recorded(normal_md): if is_airtime_recorded(normal_md):
title_re = re.match("(?P<show>\w+)-(?P<date>\d+-\d+-\d+-\d+:\d+:\d+)$", title_re = re.match("(?P<show>.+)-(?P<date>\d+-\d+-\d+-\d+:\d+:\d+)$",
normal_md['MDATA_KEY_TITLE']) normal_md['MDATA_KEY_TITLE'])
show_name = title_re.group('show') show_name = title_re.group('show')
date = title_re.group('date').replace(':','-') date = title_re.group('date').replace(':','-')

20
python_apps/media-monitor2/tests/test_pure.py
View File

@ -35,7 +35,7 @@ class TestMMP(unittest.TestCase):
for k in def_keys: self.assertEqual( sd[k], 'DEF' ) for k in def_keys: self.assertEqual( sd[k], 'DEF' )
def test_normalized_metadata(self): def test_normalized_metadata(self):
# Recorded show test first #Recorded show test first
orig = Metadata.airtime_dict({ orig = Metadata.airtime_dict({
'date' : [u'2012-08-21'], 'date' : [u'2012-08-21'],
'tracknumber' : [u'2'], 'tracknumber' : [u'2'],
@ -62,6 +62,24 @@ class TestMMP(unittest.TestCase):
organized_path = mmp.organized_path(old_path,base, normalized) organized_path = mmp.organized_path(old_path,base, normalized)
self.assertEqual(os.path.basename(organized_path), organized_base_name) self.assertEqual(os.path.basename(organized_path), organized_base_name)
def test_normalized_metadata2(self):
"""
cc-4305
"""
orig = Metadata.airtime_dict({
'date' : [u'2012-08-27'],
'tracknumber' : [u'3'],
'title' : [u'18-11-00-Untitled Show'],
'artist' : [u'Airtime Show Recorder']
})
old_path = "/home/rudi/recorded/doesnt_really_matter.ogg"
normalized = mmp.normalized_metadata(orig, old_path)
normalized['MDATA_KEY_BITRATE'] = u'256000'
opath = mmp.organized_path(old_path, "/srv/airtime/stor/",
normalized)
self.assertTrue( len(opath) > 0 )
def test_file_md5(self): def test_file_md5(self):
p = os.path.realpath(__file__) p = os.path.realpath(__file__)
m1 = mmp.file_md5(p) m1 = mmp.file_md5(p)