From 07b168664399eae165d706f36ac5e8d4c647f8d8 Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 14 Jul 2011 21:06:35 -0400 Subject: [PATCH] CC-2279: Upgrade script for converting stor directory to new format -even more fixes.. --- install/upgrades/airtime-1.9.0/airtime-upgrade.php | 6 +++--- python_apps/media-monitor/media-monitor-upgrade.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install/upgrades/airtime-1.9.0/airtime-upgrade.php b/install/upgrades/airtime-1.9.0/airtime-upgrade.php index 35c19d4e4..2ba9d692d 100644 --- a/install/upgrades/airtime-1.9.0/airtime-upgrade.php +++ b/install/upgrades/airtime-1.9.0/airtime-upgrade.php @@ -421,7 +421,7 @@ mkdir("/var/log/airtime/media-monitor/", 755, true); touch("/var/log/airtime/media-monitor/media-monitor.log"); $mediaMonitorUpgradePath = realpath(__DIR__."/../../../python_apps/media-monitor/media-monitor-upgrade.py"); -exec("sudo python $mediaMonitorUpgradePath", $output); +exec("su -c \"python $mediaMonitorUpgradePath\"", $output); print_r($output); @@ -430,9 +430,9 @@ $oldAndNewFileNames = json_decode($output[0]); print_r($oldAndNewFileNames); foreach ($oldAndNewFileNames as $pair){ - $relPathNew = substr($pair[1], 0, strlen($stor_dir)); + $relPathNew = substr($pair[1], strlen($stor_dir)); $absPathOld = $pair[0]; - $sql = "UPDATE cc_music_dirs SET filepath = \"$relPathNew\", directory=1 WHERE filepath = \"$absPathOld\""; + $sql = "UPDATE cc_files 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 e799f86b5..bf1ce3152 100644 --- a/python_apps/media-monitor/media-monitor-upgrade.py +++ b/python_apps/media-monitor/media-monitor-upgrade.py @@ -23,7 +23,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_files_dir') +stor_dir = config.get('general', 'base_files_dir') + "/stor" mmconfig.storage_directory = os.path.normpath(stor_dir) mmconfig.imported_directory = os.path.normpath(stor_dir + '/imported') @@ -34,7 +34,7 @@ mmc = MediaMonitorCommon(mmconfig) #read list of all files in stor location.....and one-by-one pass this through to #mmc.organize_files. print out json encoding of before and after pairs = [] -for root, dirs, files in os.walk(stor_dir): +for root, dirs, files in os.walk(mmconfig.storage_directory): for f in files: #print os.path.join(root, f) #print mmc.organize_new_file(os.path.join(root, f))