From 9f3218b8d9c22d199a62bf24f428539912321ea1 Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 14 Jul 2011 16:39:18 -0400 Subject: [PATCH] CC-2279: Upgrade script for converting stor directory to new format -further fixes --- install/DoctrineMigrations/Version20110629143017.php | 5 +++-- install/upgrades/airtime-1.9.0/airtime-upgrade.php | 5 +++-- python_apps/media-monitor/media-monitor-upgrade.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/install/DoctrineMigrations/Version20110629143017.php b/install/DoctrineMigrations/Version20110629143017.php index 273bb503e..bebc622a5 100644 --- a/install/DoctrineMigrations/Version20110629143017.php +++ b/install/DoctrineMigrations/Version20110629143017.php @@ -19,14 +19,15 @@ class Version20110629143017 extends AbstractMigration $cc_music_dirs->addColumn('directory', 'text', array('unique' => true)); $cc_music_dirs->setPrimaryKey(array('id')); + //end create cc_music_dirs table //start cc_files modifications $cc_files = $schema->getTable('cc_files'); - $cc_files->addColumn('directory', 'integer'); + $cc_files->addColumn('directory', 'integer', array('default'=> -1)); - $cc_files->addNamedForeignKeyConstraint('cc_music_dirs_folder_fkey', $cc_music_dirs, array('directory'), array('id'), array('onDelete' => 'CASCADE')); + //$cc_files->addNamedForeignKeyConstraint('cc_music_dirs_folder_fkey', $cc_music_dirs, array('directory'), array('id'), array('onDelete' => 'CASCADE')); //end cc_files modifications } diff --git a/install/upgrades/airtime-1.9.0/airtime-upgrade.php b/install/upgrades/airtime-1.9.0/airtime-upgrade.php index c311dd2f0..53f084cf2 100644 --- a/install/upgrades/airtime-1.9.0/airtime-upgrade.php +++ b/install/upgrades/airtime-1.9.0/airtime-upgrade.php @@ -81,7 +81,6 @@ function execSqlQuery($sql){ global $CC_DBC; $result = $CC_DBC->query($sql); - echo $sql.PHP_EOL; if (PEAR::isError($result)) { echo "* Failed sql query: $sql".PHP_EOL; echo "* Message {$result->getMessage()}".PHP_EOL; @@ -409,9 +408,10 @@ execSqlQuery($sql); //create cron file for phone home stat AirtimeInstall::CreateCronFile(); -$stor_dir = realpath($values['general']['base_dir']."/stor")."/"; +$stor_dir = realpath($values['general']['base_files_dir']."/stor")."/"; echo "* Inserting stor directory location $stor_dir into music_dirs table".PHP_EOL; $sql = "INSERT INTO cc_music_dirs (directory, type) VALUES ('$stor_dir', 'stor')"; +echo $sql.PHP_EOL; execSqlQuery($sql); //old database had a "fullpath" column that stored the absolute path of each track. We have to @@ -430,6 +430,7 @@ foreach ($oldAndNewFileNames as $pair){ $relPathNew = substr($pair[1], 0, strlen($stor_dir)); $absPathOld = $pair[0]; $sql = "UPDATE cc_music_dirs SET filepath = \"$relPathNew\", directory=1 WHERE filepath = \"$absPathOld\""; + echo $sql.PHP_EOL; execSqlQuery($sql); } diff --git a/python_apps/media-monitor/media-monitor-upgrade.py b/python_apps/media-monitor/media-monitor-upgrade.py index 40bb8970f..ac56bc9b3 100644 --- a/python_apps/media-monitor/media-monitor-upgrade.py +++ b/python_apps/media-monitor/media-monitor-upgrade.py @@ -21,7 +21,7 @@ mmconfig = AirtimeMediaConfig(logger) #get stor folder location from /etc/airtime/airtime.conf config = ConfigParser.RawConfigParser() config.read('/etc/airtime/airtime.conf') -stor_dir = config.get('general', 'base_dir') +stor_dir = config.get('general', 'base_files_dir') mmconfig.storage_directory = os.path.normpath(stor_dir) mmconfig.imported_directory = os.path.normpath(stor_dir + '/imported')