From 19a549df12b0db762c04961047bcd5ce17868f96 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 19 Jul 2011 17:41:06 -0400 Subject: [PATCH] - merge with martin's change in install/upgrade/airtime-1.9.0 --- .../airtime-1.9.0/airtime-upgrade.php | 671 ------------------ .../airtime-1.9.0/media-monitor-upgrade.py | 44 -- .../airtime-1.9.0/airtime-upgrade.php | 11 +- .../airtimefilemonitor/__init__.py | 0 .../airtimefilemonitor/airtimemetadata.py | 0 .../airtime-1.9.0/media-monitor-upgrade.py | 2 +- 6 files changed, 8 insertions(+), 720 deletions(-) delete mode 100644 install/upgrades/airtime-1.9.0/airtime-upgrade.php delete mode 100644 install/upgrades/airtime-1.9.0/media-monitor-upgrade.py rename {install => install_minimal}/upgrades/airtime-1.9.0/airtimefilemonitor/__init__.py (100%) rename {install => install_minimal}/upgrades/airtime-1.9.0/airtimefilemonitor/airtimemetadata.py (100%) diff --git a/install/upgrades/airtime-1.9.0/airtime-upgrade.php b/install/upgrades/airtime-1.9.0/airtime-upgrade.php deleted file mode 100644 index 057b3cde6..000000000 --- a/install/upgrades/airtime-1.9.0/airtime-upgrade.php +++ /dev/null @@ -1,671 +0,0 @@ -GetOne($sql); - if (PEAR::isError($result)) { - return false; - } - return true; - } - - public static function BypassMigrations($dir, $version) - { - $appDir = AirtimeInstall::GetAirtimeSrcDir(); - $command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ". - "--configuration=$dir/../../DoctrineMigrations/migrations.xml ". - "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ". - "--no-interaction --add migrations:version $version"; - system($command); - } - - public static function MigrateTablesToVersion($dir, $version) - { - $appDir = AirtimeInstall::GetAirtimeSrcDir(); - $command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ". - "--configuration=$dir/../../DoctrineMigrations/migrations.xml ". - "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ". - "--no-interaction migrations:migrate $version"; - system($command); - } - - public static function CreateCronFile(){ - // Create CRON task to run every day. Time of day is initialized to a random time. - $hour = rand(0,23); - $minute = rand(0,59); - - $fp = fopen('/etc/cron.d/airtime-crons','w'); - fwrite($fp, "$minute $hour * * * root /usr/lib/airtime/utils/phone_home_stat\n"); - fclose($fp); - } - - public static function GetAirtimeSrcDir() - { - return __DIR__."/../../../airtime_mvc"; - } - - public static function InsertCountryDataIntoDatabase(){ - $sql = "INSERT INTO cc_country (isocode, name) VALUES ('AFG', 'Afghanistan '); - INSERT INTO cc_country (isocode, name) VALUES ('ALA', 'Åland Islands'); - INSERT INTO cc_country (isocode, name) VALUES ('ALB', 'Albania '); - INSERT INTO cc_country (isocode, name) VALUES ('DZA', 'Algeria '); - INSERT INTO cc_country (isocode, name) VALUES ('ASM', 'American Samoa '); - INSERT INTO cc_country (isocode, name) VALUES ('AND', 'Andorra '); - INSERT INTO cc_country (isocode, name) VALUES ('AGO', 'Angola '); - INSERT INTO cc_country (isocode, name) VALUES ('AIA', 'Anguilla '); - INSERT INTO cc_country (isocode, name) VALUES ('ATG', 'Antigua and Barbuda '); - INSERT INTO cc_country (isocode, name) VALUES ('ARG', 'Argentina '); - INSERT INTO cc_country (isocode, name) VALUES ('ARM', 'Armenia '); - INSERT INTO cc_country (isocode, name) VALUES ('ABW', 'Aruba '); - INSERT INTO cc_country (isocode, name) VALUES ('AUS', 'Australia '); - INSERT INTO cc_country (isocode, name) VALUES ('AUT', 'Austria '); - INSERT INTO cc_country (isocode, name) VALUES ('AZE', 'Azerbaijan '); - INSERT INTO cc_country (isocode, name) VALUES ('BHS', 'Bahamas '); - INSERT INTO cc_country (isocode, name) VALUES ('BHR', 'Bahrain '); - INSERT INTO cc_country (isocode, name) VALUES ('BGD', 'Bangladesh '); - INSERT INTO cc_country (isocode, name) VALUES ('BRB', 'Barbados '); - INSERT INTO cc_country (isocode, name) VALUES ('BLR', 'Belarus '); - INSERT INTO cc_country (isocode, name) VALUES ('BEL', 'Belgium '); - INSERT INTO cc_country (isocode, name) VALUES ('BLZ', 'Belize '); - INSERT INTO cc_country (isocode, name) VALUES ('BEN', 'Benin '); - INSERT INTO cc_country (isocode, name) VALUES ('BMU', 'Bermuda '); - INSERT INTO cc_country (isocode, name) VALUES ('BTN', 'Bhutan '); - INSERT INTO cc_country (isocode, name) VALUES ('BOL', 'Bolivia (Plurinational State of) '); - INSERT INTO cc_country (isocode, name) VALUES ('BES', 'Bonaire, Saint Eustatius and Saba'); - INSERT INTO cc_country (isocode, name) VALUES ('BIH', 'Bosnia and Herzegovina '); - INSERT INTO cc_country (isocode, name) VALUES ('BWA', 'Botswana '); - INSERT INTO cc_country (isocode, name) VALUES ('BRA', 'Brazil '); - INSERT INTO cc_country (isocode, name) VALUES ('VGB', 'British Virgin Islands '); - INSERT INTO cc_country (isocode, name) VALUES ('BRN', 'Brunei Darussalam '); - INSERT INTO cc_country (isocode, name) VALUES ('BGR', 'Bulgaria '); - INSERT INTO cc_country (isocode, name) VALUES ('BFA', 'Burkina Faso '); - INSERT INTO cc_country (isocode, name) VALUES ('BDI', 'Burundi '); - INSERT INTO cc_country (isocode, name) VALUES ('KHM', 'Cambodia '); - INSERT INTO cc_country (isocode, name) VALUES ('CMR', 'Cameroon '); - INSERT INTO cc_country (isocode, name) VALUES ('CAN', 'Canada '); - INSERT INTO cc_country (isocode, name) VALUES ('CPV', 'Cape Verde '); - INSERT INTO cc_country (isocode, name) VALUES ('CYM', 'Cayman Islands '); - INSERT INTO cc_country (isocode, name) VALUES ('CAF', 'Central African Republic '); - INSERT INTO cc_country (isocode, name) VALUES ('TCD', 'Chad '); - INSERT INTO cc_country (isocode, name) VALUES ('CHL', 'Chile '); - INSERT INTO cc_country (isocode, name) VALUES ('CHN', 'China '); - INSERT INTO cc_country (isocode, name) VALUES ('HKG', 'China, Hong Kong Special Administrative Region'); - INSERT INTO cc_country (isocode, name) VALUES ('MAC', 'China, Macao Special Administrative Region'); - INSERT INTO cc_country (isocode, name) VALUES ('COL', 'Colombia '); - INSERT INTO cc_country (isocode, name) VALUES ('COM', 'Comoros '); - INSERT INTO cc_country (isocode, name) VALUES ('COG', 'Congo '); - INSERT INTO cc_country (isocode, name) VALUES ('COK', 'Cook Islands '); - INSERT INTO cc_country (isocode, name) VALUES ('CRI', 'Costa Rica '); - INSERT INTO cc_country (isocode, name) VALUES ('CIV', 'Côte d''Ivoire '); - INSERT INTO cc_country (isocode, name) VALUES ('HRV', 'Croatia '); - INSERT INTO cc_country (isocode, name) VALUES ('CUB', 'Cuba '); - INSERT INTO cc_country (isocode, name) VALUES ('CUW', 'Curaçao'); - INSERT INTO cc_country (isocode, name) VALUES ('CYP', 'Cyprus '); - INSERT INTO cc_country (isocode, name) VALUES ('CZE', 'Czech Republic '); - INSERT INTO cc_country (isocode, name) VALUES ('PRK', 'Democratic People''s Republic of Korea '); - INSERT INTO cc_country (isocode, name) VALUES ('COD', 'Democratic Republic of the Congo '); - INSERT INTO cc_country (isocode, name) VALUES ('DNK', 'Denmark '); - INSERT INTO cc_country (isocode, name) VALUES ('DJI', 'Djibouti '); - INSERT INTO cc_country (isocode, name) VALUES ('DMA', 'Dominica '); - INSERT INTO cc_country (isocode, name) VALUES ('DOM', 'Dominican Republic '); - INSERT INTO cc_country (isocode, name) VALUES ('ECU', 'Ecuador '); - INSERT INTO cc_country (isocode, name) VALUES ('EGY', 'Egypt '); - INSERT INTO cc_country (isocode, name) VALUES ('SLV', 'El Salvador '); - INSERT INTO cc_country (isocode, name) VALUES ('GNQ', 'Equatorial Guinea '); - INSERT INTO cc_country (isocode, name) VALUES ('ERI', 'Eritrea '); - INSERT INTO cc_country (isocode, name) VALUES ('EST', 'Estonia '); - INSERT INTO cc_country (isocode, name) VALUES ('ETH', 'Ethiopia '); - INSERT INTO cc_country (isocode, name) VALUES ('FRO', 'Faeroe Islands '); - INSERT INTO cc_country (isocode, name) VALUES ('FLK', 'Falkland Islands (Malvinas) '); - INSERT INTO cc_country (isocode, name) VALUES ('FJI', 'Fiji '); - INSERT INTO cc_country (isocode, name) VALUES ('FIN', 'Finland '); - INSERT INTO cc_country (isocode, name) VALUES ('FRA', 'France '); - INSERT INTO cc_country (isocode, name) VALUES ('GUF', 'French Guiana '); - INSERT INTO cc_country (isocode, name) VALUES ('PYF', 'French Polynesia '); - INSERT INTO cc_country (isocode, name) VALUES ('GAB', 'Gabon '); - INSERT INTO cc_country (isocode, name) VALUES ('GMB', 'Gambia '); - INSERT INTO cc_country (isocode, name) VALUES ('GEO', 'Georgia '); - INSERT INTO cc_country (isocode, name) VALUES ('DEU', 'Germany '); - INSERT INTO cc_country (isocode, name) VALUES ('GHA', 'Ghana '); - INSERT INTO cc_country (isocode, name) VALUES ('GIB', 'Gibraltar '); - INSERT INTO cc_country (isocode, name) VALUES ('GRC', 'Greece '); - INSERT INTO cc_country (isocode, name) VALUES ('GRL', 'Greenland '); - INSERT INTO cc_country (isocode, name) VALUES ('GRD', 'Grenada '); - INSERT INTO cc_country (isocode, name) VALUES ('GLP', 'Guadeloupe '); - INSERT INTO cc_country (isocode, name) VALUES ('GUM', 'Guam '); - INSERT INTO cc_country (isocode, name) VALUES ('GTM', 'Guatemala '); - INSERT INTO cc_country (isocode, name) VALUES ('GGY', 'Guernsey'); - INSERT INTO cc_country (isocode, name) VALUES ('GIN', 'Guinea '); - INSERT INTO cc_country (isocode, name) VALUES ('GNB', 'Guinea-Bissau '); - INSERT INTO cc_country (isocode, name) VALUES ('GUY', 'Guyana '); - INSERT INTO cc_country (isocode, name) VALUES ('HTI', 'Haiti '); - INSERT INTO cc_country (isocode, name) VALUES ('VAT', 'Holy See '); - INSERT INTO cc_country (isocode, name) VALUES ('HND', 'Honduras '); - INSERT INTO cc_country (isocode, name) VALUES ('HUN', 'Hungary '); - INSERT INTO cc_country (isocode, name) VALUES ('ISL', 'Iceland '); - INSERT INTO cc_country (isocode, name) VALUES ('IND', 'India '); - INSERT INTO cc_country (isocode, name) VALUES ('IDN', 'Indonesia '); - INSERT INTO cc_country (isocode, name) VALUES ('IRN', 'Iran (Islamic Republic of)'); - INSERT INTO cc_country (isocode, name) VALUES ('IRQ', 'Iraq '); - INSERT INTO cc_country (isocode, name) VALUES ('IRL', 'Ireland '); - INSERT INTO cc_country (isocode, name) VALUES ('IMN', 'Isle of Man '); - INSERT INTO cc_country (isocode, name) VALUES ('ISR', 'Israel '); - INSERT INTO cc_country (isocode, name) VALUES ('ITA', 'Italy '); - INSERT INTO cc_country (isocode, name) VALUES ('JAM', 'Jamaica '); - INSERT INTO cc_country (isocode, name) VALUES ('JPN', 'Japan '); - INSERT INTO cc_country (isocode, name) VALUES ('JEY', 'Jersey'); - INSERT INTO cc_country (isocode, name) VALUES ('JOR', 'Jordan '); - INSERT INTO cc_country (isocode, name) VALUES ('KAZ', 'Kazakhstan '); - INSERT INTO cc_country (isocode, name) VALUES ('KEN', 'Kenya '); - INSERT INTO cc_country (isocode, name) VALUES ('KIR', 'Kiribati '); - INSERT INTO cc_country (isocode, name) VALUES ('KWT', 'Kuwait '); - INSERT INTO cc_country (isocode, name) VALUES ('KGZ', 'Kyrgyzstan '); - INSERT INTO cc_country (isocode, name) VALUES ('LAO', 'Lao People''s Democratic Republic '); - INSERT INTO cc_country (isocode, name) VALUES ('LVA', 'Latvia '); - INSERT INTO cc_country (isocode, name) VALUES ('LBN', 'Lebanon '); - INSERT INTO cc_country (isocode, name) VALUES ('LSO', 'Lesotho '); - INSERT INTO cc_country (isocode, name) VALUES ('LBR', 'Liberia '); - INSERT INTO cc_country (isocode, name) VALUES ('LBY', 'Libyan Arab Jamahiriya '); - INSERT INTO cc_country (isocode, name) VALUES ('LIE', 'Liechtenstein '); - INSERT INTO cc_country (isocode, name) VALUES ('LTU', 'Lithuania '); - INSERT INTO cc_country (isocode, name) VALUES ('LUX', 'Luxembourg '); - INSERT INTO cc_country (isocode, name) VALUES ('MDG', 'Madagascar '); - INSERT INTO cc_country (isocode, name) VALUES ('MWI', 'Malawi '); - INSERT INTO cc_country (isocode, name) VALUES ('MYS', 'Malaysia '); - INSERT INTO cc_country (isocode, name) VALUES ('MDV', 'Maldives '); - INSERT INTO cc_country (isocode, name) VALUES ('MLI', 'Mali '); - INSERT INTO cc_country (isocode, name) VALUES ('MLT', 'Malta '); - INSERT INTO cc_country (isocode, name) VALUES ('MHL', 'Marshall Islands '); - INSERT INTO cc_country (isocode, name) VALUES ('MTQ', 'Martinique '); - INSERT INTO cc_country (isocode, name) VALUES ('MRT', 'Mauritania '); - INSERT INTO cc_country (isocode, name) VALUES ('MUS', 'Mauritius '); - INSERT INTO cc_country (isocode, name) VALUES ('MYT', 'Mayotte'); - INSERT INTO cc_country (isocode, name) VALUES ('MEX', 'Mexico '); - INSERT INTO cc_country (isocode, name) VALUES ('FSM', 'Micronesia (Federated States of)'); - INSERT INTO cc_country (isocode, name) VALUES ('MCO', 'Monaco '); - INSERT INTO cc_country (isocode, name) VALUES ('MNG', 'Mongolia '); - INSERT INTO cc_country (isocode, name) VALUES ('MNE', 'Montenegro'); - INSERT INTO cc_country (isocode, name) VALUES ('MSR', 'Montserrat '); - INSERT INTO cc_country (isocode, name) VALUES ('MAR', 'Morocco '); - INSERT INTO cc_country (isocode, name) VALUES ('MOZ', 'Mozambique '); - INSERT INTO cc_country (isocode, name) VALUES ('MMR', 'Myanmar '); - INSERT INTO cc_country (isocode, name) VALUES ('NAM', 'Namibia '); - INSERT INTO cc_country (isocode, name) VALUES ('NRU', 'Nauru '); - INSERT INTO cc_country (isocode, name) VALUES ('NPL', 'Nepal '); - INSERT INTO cc_country (isocode, name) VALUES ('NLD', 'Netherlands '); - INSERT INTO cc_country (isocode, name) VALUES ('NCL', 'New Caledonia '); - INSERT INTO cc_country (isocode, name) VALUES ('NZL', 'New Zealand '); - INSERT INTO cc_country (isocode, name) VALUES ('NIC', 'Nicaragua '); - INSERT INTO cc_country (isocode, name) VALUES ('NER', 'Niger '); - INSERT INTO cc_country (isocode, name) VALUES ('NGA', 'Nigeria '); - INSERT INTO cc_country (isocode, name) VALUES ('NIU', 'Niue '); - INSERT INTO cc_country (isocode, name) VALUES ('NFK', 'Norfolk Island '); - INSERT INTO cc_country (isocode, name) VALUES ('MNP', 'Northern Mariana Islands '); - INSERT INTO cc_country (isocode, name) VALUES ('NOR', 'Norway '); - INSERT INTO cc_country (isocode, name) VALUES ('PSE', 'Occupied Palestinian Territory '); - INSERT INTO cc_country (isocode, name) VALUES ('OMN', 'Oman '); - INSERT INTO cc_country (isocode, name) VALUES ('PAK', 'Pakistan '); - INSERT INTO cc_country (isocode, name) VALUES ('PLW', 'Palau '); - INSERT INTO cc_country (isocode, name) VALUES ('PAN', 'Panama '); - INSERT INTO cc_country (isocode, name) VALUES ('PNG', 'Papua New Guinea '); - INSERT INTO cc_country (isocode, name) VALUES ('PRY', 'Paraguay '); - INSERT INTO cc_country (isocode, name) VALUES ('PER', 'Peru '); - INSERT INTO cc_country (isocode, name) VALUES ('PHL', 'Philippines '); - INSERT INTO cc_country (isocode, name) VALUES ('PCN', 'Pitcairn '); - INSERT INTO cc_country (isocode, name) VALUES ('POL', 'Poland '); - INSERT INTO cc_country (isocode, name) VALUES ('PRT', 'Portugal '); - INSERT INTO cc_country (isocode, name) VALUES ('PRI', 'Puerto Rico '); - INSERT INTO cc_country (isocode, name) VALUES ('QAT', 'Qatar '); - INSERT INTO cc_country (isocode, name) VALUES ('KOR', 'Republic of Korea '); - INSERT INTO cc_country (isocode, name) VALUES ('MDA', 'Republic of Moldova'); - INSERT INTO cc_country (isocode, name) VALUES ('REU', 'Réunion '); - INSERT INTO cc_country (isocode, name) VALUES ('ROU', 'Romania '); - INSERT INTO cc_country (isocode, name) VALUES ('RUS', 'Russian Federation '); - INSERT INTO cc_country (isocode, name) VALUES ('RWA', 'Rwanda '); - INSERT INTO cc_country (isocode, name) VALUES ('BLM', 'Saint-Barthélemy'); - INSERT INTO cc_country (isocode, name) VALUES ('SHN', 'Saint Helena '); - INSERT INTO cc_country (isocode, name) VALUES ('KNA', 'Saint Kitts and Nevis '); - INSERT INTO cc_country (isocode, name) VALUES ('LCA', 'Saint Lucia '); - INSERT INTO cc_country (isocode, name) VALUES ('MAF', 'Saint-Martin (French part)'); - INSERT INTO cc_country (isocode, name) VALUES ('SPM', 'Saint Pierre and Miquelon '); - INSERT INTO cc_country (isocode, name) VALUES ('VCT', 'Saint Vincent and the Grenadines '); - INSERT INTO cc_country (isocode, name) VALUES ('WSM', 'Samoa '); - INSERT INTO cc_country (isocode, name) VALUES ('SMR', 'San Marino '); - INSERT INTO cc_country (isocode, name) VALUES ('STP', 'Sao Tome and Principe '); - INSERT INTO cc_country (isocode, name) VALUES ('SAU', 'Saudi Arabia '); - INSERT INTO cc_country (isocode, name) VALUES ('SEN', 'Senegal '); - INSERT INTO cc_country (isocode, name) VALUES ('SRB', 'Serbia '); - INSERT INTO cc_country (isocode, name) VALUES ('SYC', 'Seychelles '); - INSERT INTO cc_country (isocode, name) VALUES ('SLE', 'Sierra Leone '); - INSERT INTO cc_country (isocode, name) VALUES ('SGP', 'Singapore '); - INSERT INTO cc_country (isocode, name) VALUES ('SXM', 'Sint Maarten (Dutch part)'); - INSERT INTO cc_country (isocode, name) VALUES ('SVK', 'Slovakia '); - INSERT INTO cc_country (isocode, name) VALUES ('SVN', 'Slovenia '); - INSERT INTO cc_country (isocode, name) VALUES ('SLB', 'Solomon Islands '); - INSERT INTO cc_country (isocode, name) VALUES ('SOM', 'Somalia '); - INSERT INTO cc_country (isocode, name) VALUES ('ZAF', 'South Africa '); - INSERT INTO cc_country (isocode, name) VALUES ('ESP', 'Spain '); - INSERT INTO cc_country (isocode, name) VALUES ('LKA', 'Sri Lanka '); - INSERT INTO cc_country (isocode, name) VALUES ('SDN', 'Sudan '); - INSERT INTO cc_country (isocode, name) VALUES ('SUR', 'Suriname '); - INSERT INTO cc_country (isocode, name) VALUES ('SJM', 'Svalbard and Jan Mayen Islands '); - INSERT INTO cc_country (isocode, name) VALUES ('SWZ', 'Swaziland '); - INSERT INTO cc_country (isocode, name) VALUES ('SWE', 'Sweden '); - INSERT INTO cc_country (isocode, name) VALUES ('CHE', 'Switzerland '); - INSERT INTO cc_country (isocode, name) VALUES ('SYR', 'Syrian Arab Republic '); - INSERT INTO cc_country (isocode, name) VALUES ('TJK', 'Tajikistan '); - INSERT INTO cc_country (isocode, name) VALUES ('THA', 'Thailand '); - INSERT INTO cc_country (isocode, name) VALUES ('MKD', 'The former Yugoslav Republic of Macedonia '); - INSERT INTO cc_country (isocode, name) VALUES ('TLS', 'Timor-Leste'); - INSERT INTO cc_country (isocode, name) VALUES ('TGO', 'Togo '); - INSERT INTO cc_country (isocode, name) VALUES ('TKL', 'Tokelau '); - INSERT INTO cc_country (isocode, name) VALUES ('TON', 'Tonga '); - INSERT INTO cc_country (isocode, name) VALUES ('TTO', 'Trinidad and Tobago '); - INSERT INTO cc_country (isocode, name) VALUES ('TUN', 'Tunisia '); - INSERT INTO cc_country (isocode, name) VALUES ('TUR', 'Turkey '); - INSERT INTO cc_country (isocode, name) VALUES ('TKM', 'Turkmenistan '); - INSERT INTO cc_country (isocode, name) VALUES ('TCA', 'Turks and Caicos Islands '); - INSERT INTO cc_country (isocode, name) VALUES ('TUV', 'Tuvalu '); - INSERT INTO cc_country (isocode, name) VALUES ('UGA', 'Uganda '); - INSERT INTO cc_country (isocode, name) VALUES ('UKR', 'Ukraine '); - INSERT INTO cc_country (isocode, name) VALUES ('ARE', 'United Arab Emirates '); - INSERT INTO cc_country (isocode, name) VALUES ('GBR', 'United Kingdom of Great Britain and Northern Ireland'); - INSERT INTO cc_country (isocode, name) VALUES ('TZA', 'United Republic of Tanzania '); - INSERT INTO cc_country (isocode, name) VALUES ('USA', 'United States of America'); - INSERT INTO cc_country (isocode, name) VALUES ('VIR', 'United States Virgin Islands '); - INSERT INTO cc_country (isocode, name) VALUES ('URY', 'Uruguay '); - INSERT INTO cc_country (isocode, name) VALUES ('UZB', 'Uzbekistan '); - INSERT INTO cc_country (isocode, name) VALUES ('VUT', 'Vanuatu '); - INSERT INTO cc_country (isocode, name) VALUES ('VEN', 'Venezuela (Bolivarian Republic of)'); - INSERT INTO cc_country (isocode, name) VALUES ('VNM', 'Viet Nam '); - INSERT INTO cc_country (isocode, name) VALUES ('WLF', 'Wallis and Futuna Islands '); - INSERT INTO cc_country (isocode, name) VALUES ('ESH', 'Western Sahara '); - INSERT INTO cc_country (isocode, name) VALUES ('YEM', 'Yemen '); - INSERT INTO cc_country (isocode, name) VALUES ('ZMB', 'Zambia '); - INSERT INTO cc_country (isocode, name) VALUES ('ZWE', 'Zimbabwe ');"; - - echo "* Inserting data into country table".PHP_EOL; - Airtime190Upgrade::execSqlQuery($sql); - } -} - -class AirtimeIni{ - - const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf"; - const CONF_FILE_PYPO = "/etc/airtime/pypo.cfg"; - const CONF_FILE_RECORDER = "/etc/airtime/recorder.cfg"; - const CONF_FILE_LIQUIDSOAP = "/etc/airtime/liquidsoap.cfg"; - const CONF_FILE_MEDIAMONITOR = "/etc/airtime/media-monitor.cfg"; - - /** - * This function updates an INI style config file. - * - * A property and the value the property should be changed to are - * supplied. If the property is not found, then no changes are made. - * - * @param string $p_filename - * The path the to the file. - * @param string $p_property - * The property to look for in order to change its value. - * @param string $p_value - * The value the property should be changed to. - * - */ - public static function UpdateIniValue($p_filename, $p_property, $p_value) - { - $lines = file($p_filename); - $n=count($lines); - foreach ($lines as &$line) { - if ($line[0] != "#"){ - $key_value = explode("=", $line); - $key = trim($key_value[0]); - - if ($key == $p_property){ - $line = "$p_property = $p_value".PHP_EOL; - } - } - } - - $fp=fopen($p_filename, 'w'); - for($i=0; $i<$n; $i++){ - fwrite($fp, $lines[$i]); - } - fclose($fp); - } - - public static function ReadPythonConfig($p_filename) - { - $values = array(); - - $lines = file($p_filename); - $n=count($lines); - for ($i=0; $i<$n; $i++) { - if (strlen($lines[$i]) && !in_array(substr($lines[$i], 0, 1), array('#', PHP_EOL))){ - $info = explode("=", $lines[$i]); - $values[trim($info[0])] = trim($info[1]); - } - } - - return $values; - } - - public static function MergeConfigFiles($configFiles, $suffix) { - foreach ($configFiles as $conf) { - if (file_exists("$conf$suffix.bak")) { - - if($conf === AirtimeIni::CONF_FILE_AIRTIME) { - // Parse with sections - $newSettings = parse_ini_file($conf, true); - $oldSettings = parse_ini_file("$conf$suffix.bak", true); - } - else { - $newSettings = AirtimeIni::ReadPythonConfig($conf); - $oldSettings = AirtimeIni::ReadPythonConfig("$conf$suffix.bak"); - } - - $settings = array_keys($newSettings); - - foreach($settings as $section) { - if(isset($oldSettings[$section])) { - if(is_array($oldSettings[$section])) { - $sectionKeys = array_keys($newSettings[$section]); - foreach($sectionKeys as $sectionKey) { - if(isset($oldSettings[$section][$sectionKey])) { - AirtimeIni::UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]); - } - } - } - else { - AirtimeIni::UpdateIniValue($conf, $section, $oldSettings[$section]); - } - } - } - } - } - } - - public static function upgradeConfigFiles(){ - - $configFiles = array(AirtimeIni::CONF_FILE_AIRTIME, - AirtimeIni::CONF_FILE_PYPO, - AirtimeIni::CONF_FILE_RECORDER, - AirtimeIni::CONF_FILE_LIQUIDSOAP); - - // Backup the config files - $suffix = date("Ymdhis")."-1.8.1"; - foreach ($configFiles as $conf) { - if (file_exists($conf)) { - echo "Backing up $conf to $conf$suffix.bak".PHP_EOL; - copy($conf, $conf.$suffix.".bak"); - } - } - AirtimeIni::CreateIniFiles(); - AirtimeIni::MergeConfigFiles($configFiles, $suffix); - } - - /** - * This function creates the /etc/airtime configuration folder - * and copies the default config files to it. - */ - public static function CreateIniFiles() - { - if (!file_exists("/etc/airtime/")){ - if (!mkdir("/etc/airtime/", 0755, true)){ - echo "Could not create /etc/airtime/ directory. Exiting."; - exit(1); - } - } - - $AIRTIME_SRC = realpath(__DIR__.'/../../../airtime_mvc'); - $AIRTIME_PYTHON_APPS = realpath(__DIR__.'/../../../python_apps'); - - if (!copy($AIRTIME_SRC."/build/airtime.conf", AirtimeIni::CONF_FILE_AIRTIME)){ - echo "Could not copy airtime.conf to /etc/airtime/. Exiting."; - exit(1); - } - if (!copy($AIRTIME_PYTHON_APPS."/pypo/pypo.cfg", AirtimeIni::CONF_FILE_PYPO)){ - echo "Could not copy pypo.cfg to /etc/airtime/. Exiting."; - exit(1); - } - if (!copy($AIRTIME_PYTHON_APPS."/show-recorder/recorder.cfg", AirtimeIni::CONF_FILE_RECORDER)){ - echo "Could not copy recorder.cfg to /etc/airtime/. Exiting."; - exit(1); - } - if (!copy($AIRTIME_PYTHON_APPS."/pypo/liquidsoap_scripts/liquidsoap.cfg", AirtimeIni::CONF_FILE_LIQUIDSOAP)){ - echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting."; - exit(1); - } - } -} - -class Airtime190Upgrade{ - - public static function InstallAirtimePhpServerCode($phpDir) - { - - $AIRTIME_SRC = realpath(__DIR__.'/../../../airtime_mvc'); - - echo "* Installing PHP code to ".$phpDir.PHP_EOL; - exec("mkdir -p ".$phpDir); - exec("cp -R ".$AIRTIME_SRC."/* ".$phpDir); - } - - public static function CopyUtils() - { - $utilsSrc = __DIR__."/../../../utils"; - - echo "* Installing binaries to ".CONF_DIR_BINARIES.PHP_EOL; - exec("mkdir -p ".CONF_DIR_BINARIES); - exec("cp -R ".$utilsSrc." ".CONF_DIR_BINARIES); - } - - /* Removes pypo, media-monitor, show-recorder and utils from system. These will - * be reinstalled by the main airtime-upgrade script. - */ - public static function UninstallBinaries() - { - echo "* Removing Airtime binaries from ".CONF_DIR_BINARIES.PHP_EOL; - exec('rm -rf "'.CONF_DIR_BINARIES.'"'); - } - - - public static function removeOldAirtimeImport(){ - exec('rm -f "/usr/bin/airtime-import"'); - exec('rm -f "/usr/lib/airtime/utils/airtime-import.php"'); - exec('rm -rf "/usr/lib/airtime/utils/airtime-import"'); - } - - public static function updateAirtimeImportSymLink(){ - $dir = "/usr/lib/airtime/utils/airtime-import/airtime-import"; - exec("ln -s $dir /usr/bin/airtime-import"); - } - - public static function execSqlQuery($sql){ - global $CC_DBC; - - $result = $CC_DBC->query($sql); - if (PEAR::isError($result)) { - echo "* Failed sql query: $sql".PHP_EOL; - echo "* Message {$result->getMessage()}".PHP_EOL; - } - - return $result; - } - - public static function connectToDatabase(){ - global $CC_DBC, $CC_CONFIG; - - $values = parse_ini_file('/etc/airtime/airtime.conf', true); - - // Database config - $CC_CONFIG['dsn']['username'] = $values['database']['dbuser']; - $CC_CONFIG['dsn']['password'] = $values['database']['dbpass']; - $CC_CONFIG['dsn']['hostspec'] = $values['database']['host']; - $CC_CONFIG['dsn']['phptype'] = 'pgsql'; - $CC_CONFIG['dsn']['database'] = $values['database']['dbname']; - - $CC_DBC = DB::connect($CC_CONFIG['dsn'], FALSE); - } - - /* Old database had a "fullpath" column that stored the absolute path of each track. We have to - * change it so that the "fullpath" column has path relative to the "directory" column. - */ - public static function installMediaMonitor($values){ - - /* Handle Database Changes. */ - $stor_dir = realpath($values['general']['base_files_dir']."/stor")."/"; - echo "* Inserting stor directory location $stor_dir into music_dirs table".PHP_EOL; - $sql = "UPDATE cc_music_dirs SET directory='$stor_dir' WHERE type='stor'"; - echo $sql.PHP_EOL; - Airtime190Upgrade::execSqlQuery($sql); - - $sql = "SELECT id FROM cc_music_dirs WHERE type='stor'"; - echo $sql.PHP_EOL; - $rows = Airtime190Upgrade::execSqlQuery($sql); - - echo "Creating media-monitor log file".PHP_EOL; - mkdir("/var/log/airtime/media-monitor/", 755, true); - touch("/var/log/airtime/media-monitor/media-monitor.log"); - - /* create media monitor config: */ - if (!copy(__DIR__."/../../../python_apps/media-monitor/media-monitor.cfg", AirtimeIni::CONF_FILE_MEDIAMONITOR)){ - echo "Could not copy media-monitor.cfg to /etc/airtime/. Exiting."; - } - - AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_MEDIAMONITOR, "api_key", $values["general"]["api_key"]); - - echo "Reorganizing files in stor directory".PHP_EOL; - - $cwd = __DIR__; - $mediaMonitorUpgradePath = __DIR__."/media-monitor-upgrade.py"; - $command = "cd $cwd && su -c \"python $mediaMonitorUpgradePath\""; - exec($command, $output); - print_r($output); - - $oldAndNewFileNames = json_decode($output[0]); - - foreach ($oldAndNewFileNames as $pair){ - $relPathNew = pg_escape_string(substr($pair[1], strlen($stor_dir))); - $absPathOld = pg_escape_string($pair[0]); - $sql = "UPDATE cc_files SET filepath = '$relPathNew', directory=1 WHERE filepath = '$absPathOld'"; - echo $sql.PHP_EOL; - Airtime190Upgrade::execSqlQuery($sql); - } - } -} - - - - -AirtimeInstall::CreateZendPhpLogFile(); - -/* In version 1.9.0 we have have switched from daemontools to more traditional - * init.d daemon system. Let's remove all the daemontools files - */ -exec("/usr/bin/airtime-pypo-stop"); -exec("/usr/bin/airtime-show-recorder-stop"); - -exec("svc -d /etc/service/pypo"); -exec("svc -d /etc/service/pypo/log"); -exec("svc -d /etc/service/pypo-liquidsoap"); -exec("svc -d /etc/service/pypo-liquidsoap/log"); -exec("svc -d /etc/service/recorder"); -exec("svc -d /etc/service/recorder/log"); - -$pathnames = array("/usr/bin/airtime-pypo-start", - "/usr/bin/airtime-pypo-stop", - "/usr/bin/airtime-show-recorder-start", - "/usr/bin/airtime-show-recorder-stop", - "/usr/bin/airtime-media-monitor-start", - "/usr/bin/airtime-media-monitor-stop", - "/etc/service/pypo", - "/etc/service/pypo-liquidsoap", - "/etc/service/media-monitor", - "/etc/service/recorder", - "/var/log/airtime/pypo/main", - "/var/log/airtime/pypo-liquidsoap/main", - "/var/log/airtime/show-recorder/main" - ); - -foreach ($pathnames as $pn){ - echo "Removing $pn\n"; - exec("rm -rf \"$pn\""); -} - - -/* update Airtime Server PHP files */ -$values = parse_ini_file(AirtimeIni::CONF_FILE_AIRTIME, true); -$phpDir = $values['general']['airtime_dir']; -Airtime190Upgrade::InstallAirtimePhpServerCode($phpDir); - -/* update utils (/usr/lib/airtime) folder */ -Airtime190Upgrade::UninstallBinaries(); -Airtime190Upgrade::CopyUtils(); - -/* James made a new airtime-import script, lets remove the old airtime-import php script, - *install the new airtime-import.py script and update the /usr/bin/symlink. - */ -Airtime190Upgrade::removeOldAirtimeImport(); -Airtime190Upgrade::updateAirtimeImportSymLink(); - -Airtime190Upgrade::connectToDatabase(); - -if(AirtimeInstall::DbTableExists('doctrine_migration_versions') === false) { - $migrations = array('20110312121200', '20110331111708', '20110402164819', '20110406182005'); - foreach($migrations as $migration) { - AirtimeInstall::BypassMigrations(__DIR__, $migration); - } -} -/* adding music_dir and country table. 20110629143017 and 20110713161043 respetivly */ -AirtimeInstall::MigrateTablesToVersion(__DIR__, '20110713161043'); - -AirtimeInstall::InsertCountryDataIntoDatabase(); - - - -/* create cron file for phone home stat */ -AirtimeInstall::CreateCronFile(); - -Airtime190Upgrade::installMediaMonitor($values); - -AirtimeIni::upgradeConfigFiles(); - - - - diff --git a/install/upgrades/airtime-1.9.0/media-monitor-upgrade.py b/install/upgrades/airtime-1.9.0/media-monitor-upgrade.py deleted file mode 100644 index 6dce39c26..000000000 --- a/install/upgrades/airtime-1.9.0/media-monitor-upgrade.py +++ /dev/null @@ -1,44 +0,0 @@ -from airtimefilemonitor.mediamonitorcommon import MediaMonitorCommon -from airtimefilemonitor.mediaconfig import AirtimeMediaConfig - -import logging -import logging.config -import sys -import os -import json -import ConfigParser - -import os.path - -# configure logging -try: - logging.config.fileConfig("logging.cfg") -except Exception, e: - print 'Error configuring logging: ', e - sys.exit(1) - -logger = logging.getLogger() -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" - -mmconfig.storage_directory = os.path.normpath(stor_dir) -mmconfig.imported_directory = os.path.normpath(stor_dir + '/imported') -mmconfig.organize_directory = os.path.normpath(stor_dir + '/organize') - -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(mmconfig.storage_directory): - for f in files: - #print os.path.join(root, f) - #print mmc.organize_new_file(os.path.join(root, f)) - pair = os.path.join(root, f), mmc.organize_new_file(os.path.join(root, f)) - pairs.append(pair) - -print json.dumps(pairs) diff --git a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php index ae6b7b88b..057b3cde6 100644 --- a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php @@ -559,7 +559,7 @@ class Airtime190Upgrade{ echo $sql.PHP_EOL; $rows = Airtime190Upgrade::execSqlQuery($sql); - echo "Creating media-monitor log file"; + echo "Creating media-monitor log file".PHP_EOL; mkdir("/var/log/airtime/media-monitor/", 755, true); touch("/var/log/airtime/media-monitor/media-monitor.log"); @@ -570,9 +570,12 @@ class Airtime190Upgrade{ AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_MEDIAMONITOR, "api_key", $values["general"]["api_key"]); - echo "Reorganizing files in stor directory"; - $mediaMonitorUpgradePath = realpath(__DIR__."/../../../python_apps/media-monitor/media-monitor-upgrade.py"); - exec("su -c \"python $mediaMonitorUpgradePath\"", $output); + echo "Reorganizing files in stor directory".PHP_EOL; + + $cwd = __DIR__; + $mediaMonitorUpgradePath = __DIR__."/media-monitor-upgrade.py"; + $command = "cd $cwd && su -c \"python $mediaMonitorUpgradePath\""; + exec($command, $output); print_r($output); $oldAndNewFileNames = json_decode($output[0]); diff --git a/install/upgrades/airtime-1.9.0/airtimefilemonitor/__init__.py b/install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor/__init__.py similarity index 100% rename from install/upgrades/airtime-1.9.0/airtimefilemonitor/__init__.py rename to install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor/__init__.py diff --git a/install/upgrades/airtime-1.9.0/airtimefilemonitor/airtimemetadata.py b/install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor/airtimemetadata.py similarity index 100% rename from install/upgrades/airtime-1.9.0/airtimefilemonitor/airtimemetadata.py rename to install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor/airtimemetadata.py diff --git a/install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py b/install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py index bf1ce3152..6dce39c26 100644 --- a/install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py +++ b/install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py @@ -12,7 +12,7 @@ import os.path # configure logging try: - logging.config.fileConfig("%s/logging.cfg"%os.path.dirname(__file__)) + logging.config.fileConfig("logging.cfg") except Exception, e: print 'Error configuring logging: ', e sys.exit(1)