From 3caa5adce2488f2ddbbf1a9943bf60b96c1521df Mon Sep 17 00:00:00 2001 From: James Date: Mon, 2 Apr 2012 13:57:14 -0400 Subject: [PATCH] CC-3421: Upgrade Script: add/enhance upgrade script for network drive files handler feature --- .../airtime-2.1.0/ConfFileUpgrade.php | 1 + .../upgrades/airtime-2.1.0/DbUpgrade.php | 2 +- .../airtime-2.1.0/common/UpgradeCommon.php | 16 +++++------ .../common/Version20120402103944.php | 28 +++++++++++++++++++ .../airtime-2.1.0/common/migrations.xml | 15 ++++++++++ 5 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 install_minimal/upgrades/airtime-2.1.0/common/Version20120402103944.php create mode 100644 install_minimal/upgrades/airtime-2.1.0/common/migrations.xml diff --git a/install_minimal/upgrades/airtime-2.1.0/ConfFileUpgrade.php b/install_minimal/upgrades/airtime-2.1.0/ConfFileUpgrade.php index f7aea03c3..8aab3191d 100644 --- a/install_minimal/upgrades/airtime-2.1.0/ConfFileUpgrade.php +++ b/install_minimal/upgrades/airtime-2.1.0/ConfFileUpgrade.php @@ -11,5 +11,6 @@ class AirtimeConfigFileUpgrade{ } private static function task0(){ + UpgradeCommon::upgradeConfigFiles(); } } diff --git a/install_minimal/upgrades/airtime-2.1.0/DbUpgrade.php b/install_minimal/upgrades/airtime-2.1.0/DbUpgrade.php index 0fe093db2..bff331446 100644 --- a/install_minimal/upgrades/airtime-2.1.0/DbUpgrade.php +++ b/install_minimal/upgrades/airtime-2.1.0/DbUpgrade.php @@ -11,7 +11,7 @@ class AirtimeDatabaseUpgrade{ } private static function task0(){ - + UpgradeCommon::MigrateTablesToVersion(__DIR__, '20120402103944'); } } diff --git a/install_minimal/upgrades/airtime-2.1.0/common/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.1.0/common/UpgradeCommon.php index 75fe5012c..7d3d5deeb 100644 --- a/install_minimal/upgrades/airtime-2.1.0/common/UpgradeCommon.php +++ b/install_minimal/upgrades/airtime-2.1.0/common/UpgradeCommon.php @@ -14,8 +14,8 @@ class UpgradeCommon{ const CONF_PYPO_GRP = "pypo"; const CONF_WWW_DATA_GRP = "www-data"; - const CONF_BACKUP_SUFFIX = "202"; - const VERSION_NUMBER = "2.0.2"; + const CONF_BACKUP_SUFFIX = "210"; + const VERSION_NUMBER = "2.1.0"; public static function SetDefaultTimezone() { @@ -69,7 +69,7 @@ class UpgradeCommon{ $appDir = self::GetAirtimeSrcDir(); $command = "php --php-ini $dir/../../airtime-php.ini ". "$appDir/library/doctrine/migrations/doctrine-migrations.phar ". - "--configuration=$dir/../../DoctrineMigrations/migrations.xml ". + "--configuration=$dir/migrations.xml ". "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ". "--no-interaction migrations:migrate $version"; system($command); @@ -80,7 +80,7 @@ class UpgradeCommon{ $appDir = self::GetAirtimeSrcDir(); $command = "php --php-ini $dir/../../airtime-php.ini ". "$appDir/library/doctrine/migrations/doctrine-migrations.phar ". - "--configuration=$dir/../../DoctrineMigrations/migrations.xml ". + "--configuration=$dir/migrations.xml ". "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ". "--no-interaction --add migrations:version $version"; system($command); @@ -122,19 +122,19 @@ class UpgradeCommon{ } } - if (!copy(__DIR__."/airtime.conf.$suffix", self::CONF_FILE_AIRTIME)){ + if (!copy(__DIR__."../etc/airtime.conf.$suffix", self::CONF_FILE_AIRTIME)){ echo "Could not copy airtime.conf to /etc/airtime/. Exiting."; exit(1); } - if (!copy(__DIR__."/pypo.cfg.$suffix", self::CONF_FILE_PYPO)){ + if (!copy(__DIR__."../etc/pypo.cfg.$suffix", self::CONF_FILE_PYPO)){ echo "Could not copy pypo.cfg to /etc/airtime/. Exiting."; exit(1); } - if (!copy(__DIR__."/media-monitor.cfg.$suffix", self::CONF_FILE_MEDIAMONITOR)){ + if (!copy(__DIR__."../etc/media-monitor.cfg.$suffix", self::CONF_FILE_MEDIAMONITOR)){ echo "Could not copy meadia-monitor.cfg to /etc/airtime/. Exiting."; exit(1); } - if (!copy(__DIR__."/api_client.cfg.$suffix", self::CONF_FILE_API_CLIENT)){ + if (!copy(__DIR__."../etc/api_client.cfg.$suffix", self::CONF_FILE_API_CLIENT)){ echo "Could not copy api_client.cfg to /etc/monit/conf.d/. Exiting."; exit(1); } diff --git a/install_minimal/upgrades/airtime-2.1.0/common/Version20120402103944.php b/install_minimal/upgrades/airtime-2.1.0/common/Version20120402103944.php new file mode 100644 index 000000000..a7fb015ad --- /dev/null +++ b/install_minimal/upgrades/airtime-2.1.0/common/Version20120402103944.php @@ -0,0 +1,28 @@ +getTable('cc_music_dirs'); + $cc_music_dirs->addColumn('watched', 'boolean', array('default'=> 'true')); + $cc_music_dirs->addColumn('exists', 'boolean', array('default'=> 'true')); + + $cc_files = $schema->getTable('cc_files'); + $cc_files->addColumn('file_exists', 'boolean', array('default'=> 'true')); + + $this->dropForeignKey('cc_files', 'cc_music_dirs_folder_fkey'); + $cc_files->addNamedForeignKeyConstraint('cc_music_dirs_folder_fkey', $cc_music_dirs, array('directory'), array('id')); + $cc_files->addIndex('file_exists', 'cc_files_file_exists_idx'); + } + + public function down(Schema $schema) + { + + } +} \ No newline at end of file diff --git a/install_minimal/upgrades/airtime-2.1.0/common/migrations.xml b/install_minimal/upgrades/airtime-2.1.0/common/migrations.xml new file mode 100644 index 000000000..c78b0c499 --- /dev/null +++ b/install_minimal/upgrades/airtime-2.1.0/common/migrations.xml @@ -0,0 +1,15 @@ + + + + Airtime 2.0.0 Database Upgrade + + DoctrineMigrations + + + + ./ + +