Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/configs/conf.php

@@ -6,7 +6,7 @@
  * /etc/airtime/recorder.cfg
  */
 
-define('AIRTIME_VERSION', '1.9.0-devel');
+define('AIRTIME_VERSION', '1.8.2');
 define('AIRTIME_COPYRIGHT_DATE', '2010-2011');
 define('AIRTIME_REST_VERSION', '1.1');
 

install/airtime-install.php

@@ -107,8 +107,8 @@ system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py");
 echo PHP_EOL."*** Recorder Installation ***".PHP_EOL;
 system("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py");
 
-echo PHP_EOL."*** Media Monitor Installation ***".PHP_EOL;
+//echo PHP_EOL."*** Media Monitor Installation ***".PHP_EOL;
-system("python ".__DIR__."/../python_apps/pytag-fs/install/media-monitor-install.py");
+//system("python ".__DIR__."/../python_apps/pytag-fs/install/media-monitor-install.py");
 
 AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION);
 

install/airtime-uninstall.php

@@ -88,9 +88,9 @@ echo PHP_EOL."*** Uninstalling Show Recorder ***".PHP_EOL;
 $command = "python ".__DIR__."/../python_apps/show-recorder/install/recorder-uninstall.py";
 system($command);
 
-echo PHP_EOL."*** Uninstalling Media Monitor ***".PHP_EOL;
+//echo PHP_EOL."*** Uninstalling Media Monitor ***".PHP_EOL;
-$command = "python ".__DIR__."/../python_apps/pytag-fs/install/media-monitor-uninstall.py";
+//$command = "python ".__DIR__."/../python_apps/pytag-fs/install/media-monitor-uninstall.py";
-system($command);
+//system($command);
 
 #Disabled as this should be a manual process
 #AirtimeIni::RemoveIniFiles();

install/airtime-upgrade.php

@@ -34,18 +34,24 @@ if(strcmp($version, "1.7.0") < 0) {
 if(strcmp($version, "1.8.0") < 0) {
     system("php ".__DIR__."/upgrades/airtime-1.8/airtime-upgrade.php");
 }
-if (strcmp($version, "1.9.0") < 0){
+if(strcmp($version, "1.8.1") < 0) {
-    system("php ".__DIR__."/upgrades/airtime-1.9/airtime-upgrade.php");
+    system("php ".__DIR__."/upgrades/airtime-1.8.1/airtime-upgrade.php");
 }
+if(strcmp($version, "1.8.2") < 0) {
+    system("php ".__DIR__."/upgrades/airtime-1.8.2/airtime-upgrade.php");
+}
+//if (strcmp($version, "1.9.0") < 0){
+    //system("php ".__DIR__."/upgrades/airtime-1.9/airtime-upgrade.php");
+//}
 
 AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION);
 
-echo PHP_EOL."*** Updating Pypo ***".PHP_EOL;
-system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py");
-
 echo PHP_EOL."*** Updating Recorder ***".PHP_EOL;
 system("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py");
 
+echo PHP_EOL."*** Updating Pypo ***".PHP_EOL;
+system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py");
+
 echo "******************************* Update Complete *******************************".PHP_EOL;
 
 

install/include/AirtimeIni.php

@@ -184,4 +184,55 @@ class AirtimeIni
         AirtimeIni::UpdateIniValue(AirtimeIni::CONF_FILE_MEDIAMONITOR, 'api_key', "'$api_key'");
         AirtimeIni::UpdateIniValue(AirtimeInstall::CONF_DIR_WWW.'/build/build.properties', 'project.home', AirtimeInstall::CONF_DIR_WWW);
     }
+
+    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 === 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]);
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

install/upgrades/airtime-1.8.1/airtime-upgrade.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package Airtime
+ * @subpackage StorageServer
+ * @copyright 2010 Sourcefabric O.P.S.
+ * @license http://www.gnu.org/licenses/gpl.txt
+ */
+
+set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
+require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php';
+require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
+require_once(dirname(__FILE__).'/../../include/AirtimeIni.php');
+
+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";
+
+$configFiles = array(CONF_FILE_AIRTIME,
+                     CONF_FILE_PYPO,
+                     CONF_FILE_RECORDER,
+                     CONF_FILE_LIQUIDSOAP);
+
+$suffix = date("Ymdhis");
+foreach ($configFiles as $conf) {
+    if (file_exists($conf)) {
+        echo "Backing up $conf to $conf$suffix.bak".PHP_EOL;
+        exec("cp $conf $conf$suffix.bak");
+    }
+}
+
+AirtimeIni::CreateIniFiles();
+echo "* Initializing INI files".PHP_EOL;
+AirtimeIni::MergeConfigFiles($configFiles, $suffix);
+global $CC_CONFIG;
+$CC_CONFIG = Config::loadConfig($CC_CONFIG);
+
+AirtimeInstall::InstallPhpCode();
+AirtimeInstall::InstallBinaries();

install/upgrades/airtime-1.8.2/airtime-upgrade.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package Airtime
+ * @subpackage StorageServer
+ * @copyright 2010 Sourcefabric O.P.S.
+ * @license http://www.gnu.org/licenses/gpl.txt
+ */
+
+set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
+require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php';
+require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
+require_once(dirname(__FILE__).'/../../include/AirtimeIni.php');
+
+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";
+
+$configFiles = array(CONF_FILE_AIRTIME,
+                     CONF_FILE_PYPO,
+                     CONF_FILE_RECORDER,
+                     CONF_FILE_LIQUIDSOAP);
+
+$suffix = date("Ymdhis");
+foreach ($configFiles as $conf) {
+    if (file_exists($conf)) {
+        echo "Backing up $conf to $conf$suffix.bak".PHP_EOL;
+        exec("cp $conf $conf$suffix.bak");
+    }
+}
+
+AirtimeIni::CreateIniFiles();
+echo "* Initializing INI files".PHP_EOL;
+AirtimeIni::MergeConfigFiles($configFiles, $suffix);
+
+global $CC_CONFIG;
+$CC_CONFIG = Config::loadConfig($CC_CONFIG);
+
+AirtimeInstall::InstallPhpCode();
+AirtimeInstall::InstallBinaries();

install/upgrades/airtime-1.8/airtime-upgrade.php

@@ -61,7 +61,8 @@ AirtimeInstall::InstallBinaries();
 
 echo "* Initializing INI files".PHP_EOL;
 AirtimeIni::UpdateIniFiles();
-Config::loadConfig();
+global $CC_CONFIG;
+$CC_CONFIG = Config::loadConfig($CC_CONFIG);
 
 echo "* Creating default storage directory".PHP_EOL;
 AirtimeInstall::InstallStorageDirectory();

python_apps/api_clients/api_client.py

@@ -19,7 +19,7 @@ import json
 import os
 from urlparse import urlparse
 
-AIRTIME_VERSION = "1.9.0"
+AIRTIME_VERSION = "1.8.2"
 
 def api_client_factory(config):
     if config["api_client"] == "airtime":
@@ -196,16 +196,16 @@ class AirTimeApiClient(ApiClientInterface):
                 print 'Unable to get Airtime version number.'
                 print
             return False
-        elif (version[0:3] != AIRTIME_VERSION): 
+        elif (version[0:3] != AIRTIME_VERSION[0:3]):
             if (verbose):
-                print 'Airtime version: ' + str(version)
+                print 'Airtime version found: ' + str(version)
-                print 'pypo not compatible with this version of Airtime.'
+                print 'pypo is at version ' +AIRTIME_VERSION+' and is not compatible with this version of Airtime.'
                 print
             return False
         else:
             if (verbose):
                 print 'Airtime version: ' + str(version)
-                print 'pypo is compatible with this version of Airtime.'
+                print 'pypo is at version ' +AIRTIME_VERSION+' and is compatible with this version of Airtime.'
                 print
             return True