From 8a490c3aa4691ca87bd42c7a5938859bbe733d0d Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 28 Aug 2012 10:52:20 -0400 Subject: [PATCH 1/5] cc-4305: removed extra commas that don't do anything --- python_apps/media-monitor2/media/monitor/pure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index f52871dc0..9e447a47a 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/python_apps/media-monitor2/media/monitor/pure.py @@ -293,7 +293,7 @@ def organized_path(old_path, root_path, orig_md): if is_airtime_recorded(normal_md): title_re = re.match("(?P\w+)-(?P\d+-\d+-\d+-\d+:\d+:\d+)$", normal_md['MDATA_KEY_TITLE']) - show_name, = title_re.group('show'), + show_name = title_re.group('show') date = title_re.group('date').replace(':','-') yyyy, mm, _ = normal_md['MDATA_KEY_YEAR'].split('-',2) fname_base = '%s-%s-%s.%s' % \ From 52b24235967fb3512a49cf2ff17db8708c4d5a0e Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 28 Aug 2012 10:54:55 -0400 Subject: [PATCH 2/5] cc-4305: documented set_metadata_and_save --- python_apps/pypo/recorder.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python_apps/pypo/recorder.py b/python_apps/pypo/recorder.py index f5601fa6c..dcf74fa04 100644 --- a/python_apps/pypo/recorder.py +++ b/python_apps/pypo/recorder.py @@ -134,6 +134,10 @@ class ShowRecorder(Thread): self.api_client.upload_recorded_show(datagen, headers) def set_metadata_and_save(self, filepath): + """ + Writes song to 'filepath'. Uses metadata from: + self.start_time, self.show_name, self.show_instance + """ try: date = self.start_time md = date.split(" ") From 7a926edd8f8d3295788e6c754b57c8e66661b311 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 28 Aug 2012 11:07:32 -0400 Subject: [PATCH 3/5] cc-4305: renamed time variable not to interefere with time module --- python_apps/pypo/recorder.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/python_apps/pypo/recorder.py b/python_apps/pypo/recorder.py index dcf74fa04..1bba9596c 100644 --- a/python_apps/pypo/recorder.py +++ b/python_apps/pypo/recorder.py @@ -141,18 +141,16 @@ class ShowRecorder(Thread): try: date = self.start_time md = date.split(" ") - # TODO : rename 'time' variable to something better so that there - # is no naming conflicts with the time module that is being - # imported - time = md[1].replace(":", "-") - self.logger.info("time: %s" % time) - name = time + "-" + self.show_name + record_time = md[1].replace(":", "-") + self.logger.info("time: %s" % record_time) + + show_title = time + "-" + self.show_name artist = "Airtime Show Recorder" #set some metadata for our file daemon recorded_file = mutagen.File(filepath, easy = True) - recorded_file['title'] = name + recorded_file['title'] = show_title recorded_file['artist'] = artist recorded_file['date'] = md[0] #recorded_file['date'] = md[0].split("-")[0] From 03015ac89c16cc20a6ca1a2c83147769d2159870 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 28 Aug 2012 11:11:01 -0400 Subject: [PATCH 4/5] cc-4305: removed unnecessary temporary variable --- python_apps/pypo/recorder.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python_apps/pypo/recorder.py b/python_apps/pypo/recorder.py index 1bba9596c..4acff83e7 100644 --- a/python_apps/pypo/recorder.py +++ b/python_apps/pypo/recorder.py @@ -145,12 +145,11 @@ class ShowRecorder(Thread): record_time = md[1].replace(":", "-") self.logger.info("time: %s" % record_time) - show_title = time + "-" + self.show_name artist = "Airtime Show Recorder" #set some metadata for our file daemon recorded_file = mutagen.File(filepath, easy = True) - recorded_file['title'] = show_title + recorded_file['title'] = record_time + "-" + self.show_name recorded_file['artist'] = artist recorded_file['date'] = md[0] #recorded_file['date'] = md[0].split("-")[0] From a276e1c2c6b60c1bd7ed351635ac5b0be905b1ce Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 28 Aug 2012 11:54:35 -0400 Subject: [PATCH 5/5] cc-4305: Fixed bug + added test. --- .../media-monitor2/media/monitor/pure.py | 3 ++- python_apps/media-monitor2/tests/test_pure.py | 20 ++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index 9e447a47a..97645a15b 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/python_apps/media-monitor2/media/monitor/pure.py @@ -290,8 +290,9 @@ def organized_path(old_path, root_path, orig_md): normal_md['MDATA_KEY_BITRATE'] = formatted + 'kbps' else: normal_md['MDATA_KEY_BITRATE'] = unicode_unknown + if is_airtime_recorded(normal_md): - title_re = re.match("(?P\w+)-(?P\d+-\d+-\d+-\d+:\d+:\d+)$", + title_re = re.match("(?P.+)-(?P\d+-\d+-\d+-\d+:\d+:\d+)$", normal_md['MDATA_KEY_TITLE']) show_name = title_re.group('show') date = title_re.group('date').replace(':','-') diff --git a/python_apps/media-monitor2/tests/test_pure.py b/python_apps/media-monitor2/tests/test_pure.py index b4e870023..69a920ecc 100644 --- a/python_apps/media-monitor2/tests/test_pure.py +++ b/python_apps/media-monitor2/tests/test_pure.py @@ -35,7 +35,7 @@ class TestMMP(unittest.TestCase): for k in def_keys: self.assertEqual( sd[k], 'DEF' ) def test_normalized_metadata(self): - # Recorded show test first + #Recorded show test first orig = Metadata.airtime_dict({ 'date' : [u'2012-08-21'], 'tracknumber' : [u'2'], @@ -62,6 +62,24 @@ class TestMMP(unittest.TestCase): organized_path = mmp.organized_path(old_path,base, normalized) 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): p = os.path.realpath(__file__) m1 = mmp.file_md5(p)