From 0ca45e343b85193ee7ab0d1a28eaa98df1123db1 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 6 Jun 2012 14:18:54 -0400 Subject: [PATCH 1/3] CC-3878: Recorded media file's track number is changed after restarting media-monitor - fixed --- .../application/controllers/ApiController.php | 2 +- .../airtimefilemonitor/airtimenotifier.py | 14 +++++++++----- .../airtimefilemonitor/airtimeprocessevent.py | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index ffb46b97f..15f9dbc61 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -493,7 +493,7 @@ class ApiController extends Zend_Controller_Action //$file->setMetadataValue('MDATA_KEY_TITLE', $tmpTitle); $file->setMetadataValue('MDATA_KEY_CREATOR', "Airtime Show Recorder"); - $file->setMetadataValue('MDATA_KEY_TRACKNUMBER', null); + $file->setMetadataValue('MDATA_KEY_TRACKNUMBER', $show_instance_id); if (!$showCanceled && Application_Model_Preference::GetAutoUploadRecordedShowToSoundcloud()) { diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py index 6f6040db3..be301c958 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py @@ -159,7 +159,7 @@ class AirtimeNotifier(Notifier): return md.update(mutagen) - if event['is_recorded_show']: + if 'is_recorded_show' in event and event['is_recorded_show']: self.api_client.update_media_metadata(md, mode, True) else: self.api_client.update_media_metadata(md, mode) @@ -169,12 +169,16 @@ class AirtimeNotifier(Notifier): if mutagen is None: return md.update(mutagen) - self.api_client.update_media_metadata(md, mode) - + if 'is_recorded_show' in event and event['is_recorded_show']: + self.api_client.update_media_metadata(md, mode, True) + else: + self.api_client.update_media_metadata(md, mode) elif (mode == self.config.MODE_MOVED): md['MDATA_KEY_MD5'] = self.md_manager.get_md5(filepath) - self.api_client.update_media_metadata(md, mode) - + if 'is_recorded_show' in event and event['is_recorded_show']: + self.api_client.update_media_metadata(md, mode, True) + else: + self.api_client.update_media_metadata(md, mode) elif (mode == self.config.MODE_DELETE): self.api_client.update_media_metadata(md, mode) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py index dc10b8a85..2195e9d91 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py @@ -180,7 +180,8 @@ class AirtimeProcessEvent(ProcessEvent): if not dir and not self.mmc.is_parent_directory(pathname, self.config.organize_directory): self.logger.info("Modified: %s", pathname) if self.mmc.is_audio_file(name): - self.file_events.append({'filepath': pathname, 'mode': self.config.MODE_MODIFY}) + is_recorded = self.mmc.is_parent_directory(pathname, self.config.recorded_directory) + self.file_events.append({'filepath': pathname, 'mode': self.config.MODE_MODIFY, 'is_recorded_show': is_recorded}) # if change is detected on /etc/mtab, we check what mount(file system) was added/removed # and act accordingly From fb533bed0761c8392f998c2459893c2e7aea480f Mon Sep 17 00:00:00 2001 From: James Date: Wed, 6 Jun 2012 14:26:23 -0400 Subject: [PATCH 2/3] CC-3855: System -> Support Feedback: Cannot uncheck 'Promote my station on Sourcefabric.org' if it's checked then saved. - fixed --- airtime_mvc/application/controllers/PreferenceController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index a78bfd6e2..2175d79de 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -71,12 +71,12 @@ class PreferenceController extends Zend_Controller_Action $isSass = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; $form = new Application_Form_SupportSettings(); - if ($request->isPost()) { $values = $request->getPost(); if ($form->isValid($values)) { if (!$isSass && $values["Publicise"] != 1){ Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]); + Application_Model_Preference::SetPublicise($values["Publicise"]); if(isset($values["Privacy"])){ Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]); } From e35692e588d2dbd87fc04ba67fc60ca32029f111 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 6 Jun 2012 16:28:41 -0400 Subject: [PATCH 3/3] CC-3939: Media Library -> Edit Metadata: click 'Cancel' will keep in editing page after error message appears - fixed --- airtime_mvc/application/forms/EditAudioMD.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php index 96d29bda5..3123c93e0 100644 --- a/airtime_mvc/application/forms/EditAudioMD.php +++ b/airtime_mvc/application/forms/EditAudioMD.php @@ -136,7 +136,7 @@ class Application_Form_EditAudioMD extends Zend_Form 'ignore' => true, 'class' => 'ui-button ui-state-default ui-button-text-only md-cancel', 'label' => 'Cancel', - 'onclick' => 'javascript:document.location = document.referrer', + 'onclick' => 'javascript:document.location.href = "/Playlist"', 'decorators' => array( 'ViewHelper' )