From 4d7d17fe553f7e4d5d9691d7cad802cc006f8f3e Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 4 May 2012 17:25:59 -0400 Subject: [PATCH 1/4] fix invalid file variable name --- .../media-monitor/airtimefilemonitor/airtimeprocessevent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py index 419bbd685..14c5ec64d 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py @@ -239,7 +239,7 @@ class AirtimeProcessEvent(ProcessEvent): #if stuff dropped in stor via a UI move must change file permissions. self.mmc.is_readable(event.pathname, event.dir) if not event.dir: - if self.mmc.is_audio_file(event.name) and self.mmc.is_readable(full_filepath, False): + if self.mmc.is_audio_file(event.name) and self.mmc.is_readable(event.name, False): if event.cookie in self.temp_files: self.file_events.append({'filepath': event.pathname, 'mode': self.config.MODE_MODIFY}) del self.temp_files[event.cookie] From 495ad633336f61b4c22286ece683ed627d1464c4 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 4 May 2012 17:37:30 -0400 Subject: [PATCH 2/4] CC-3732: NationTalk Database upgrade fail, from 2.0.3 to 2.1.0 -move NOT NULL constraint to after the column has been populated --- .../upgrades/airtime-2.1.0/common/Version20120411174904.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install_minimal/upgrades/airtime-2.1.0/common/Version20120411174904.php b/install_minimal/upgrades/airtime-2.1.0/common/Version20120411174904.php index 3c5891c99..436070b3b 100644 --- a/install_minimal/upgrades/airtime-2.1.0/common/Version20120411174904.php +++ b/install_minimal/upgrades/airtime-2.1.0/common/Version20120411174904.php @@ -13,18 +13,18 @@ class Version20120411174904 extends AbstractMigration public function up(Schema $schema) { $this->_addSql("ALTER TABLE cc_show_instances ADD created timestamp"); - $this->_addSql("ALTER TABLE cc_show_instances ALTER COLUMN created SET NOT NULL"); - $this->_addSql("ALTER TABLE cc_show_instances ADD last_scheduled timestamp"); //setting these to a default now for timeline refresh purposes. $now = gmdate("Y-m-d H:i:s"); $this->_addSql("UPDATE cc_show_instances SET created = '$now'"); $this->_addSql("UPDATE cc_show_instances SET last_scheduled = '$now'"); + + $this->_addSql("ALTER TABLE cc_show_instances ALTER COLUMN created SET NOT NULL"); } public function down(Schema $schema) { } -} \ No newline at end of file +} From b1611f5b863ae52277cccce053b459fdf01eca99 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 4 May 2012 18:01:49 -0400 Subject: [PATCH 3/4] CC-3749: Media Monitor should not load files pypo cannot read -incorrect variable name --- .../media-monitor/airtimefilemonitor/airtimeprocessevent.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py index 14c5ec64d..d5986e868 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py @@ -236,10 +236,9 @@ class AirtimeProcessEvent(ProcessEvent): filename = self.mount_file_dir +"/mtab" if event.pathname in filename: self.handle_mount_change() - #if stuff dropped in stor via a UI move must change file permissions. - self.mmc.is_readable(event.pathname, event.dir) + if not event.dir: - if self.mmc.is_audio_file(event.name) and self.mmc.is_readable(event.name, False): + if self.mmc.is_audio_file(event.name) and self.mmc.is_readable(event.path, False): if event.cookie in self.temp_files: self.file_events.append({'filepath': event.pathname, 'mode': self.config.MODE_MODIFY}) del self.temp_files[event.cookie] From 0685148c107c0aee266c885bb7239f11be714195 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 4 May 2012 18:05:02 -0400 Subject: [PATCH 4/4] CC-3749: Media Monitor should not load files pypo cannot read -incorrect variable name --- .../media-monitor/airtimefilemonitor/airtimeprocessevent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py index d5986e868..6d1ffbfa8 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py @@ -238,7 +238,7 @@ class AirtimeProcessEvent(ProcessEvent): self.handle_mount_change() if not event.dir: - if self.mmc.is_audio_file(event.name) and self.mmc.is_readable(event.path, False): + if self.mmc.is_audio_file(event.name) and self.mmc.is_readable(event.pathname, False): if event.cookie in self.temp_files: self.file_events.append({'filepath': event.pathname, 'mode': self.config.MODE_MODIFY}) del self.temp_files[event.cookie]