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 +} diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py index 419bbd685..6d1ffbfa8 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(full_filepath, 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]