Merge branch '1.9.1' into devel

Conflicts:
	python_apps/pypo/pypopush.py

Changelog

@@ -17,6 +17,7 @@
     -Fixed issue where incorrect Start Date and Time entered for a new show was not handled gracefully
     -Fixed issue where using Cyrillic characters in a show name would sometimes cause it to not play
     -Fixed pypo hanging if web server is unavailable
+    -Fixed items that were being dragged and dropped in the Playlist Builder being obscured by other UI elements.
     
 1.9.3 - August 26th, 2011
   *Improvements

install_full/ubuntu/airtime-full-install

@@ -7,7 +7,7 @@ exec > >(tee install_log.txt)
 exec 2>&1
 
 if [ "$(id -u)" != "0" ]; then
-	echo "You need root privileges to run this script"
+    echo "Please run as root user."
 	exit 1
 fi
 

install_minimal/airtime-install

@@ -2,6 +2,11 @@
 #-e Causes bash script to exit if any of the installers
 #return with a non-zero return value.
 
+if [ `whoami` != 'root' ]; then
+    echo "Please run as root user."
+    exit 1
+fi
+
 set +e
 DEB=$(dpkg -s airtime 2> /dev/null | grep Status)
 set -e
@@ -26,7 +31,7 @@ echo -e "\n*** Creating Pypo User ***"
 python ${SCRIPTPATH}/../python_apps/create-pypo-user.py
 
 set +e
-php --php-ini ${SCRIPTPATH}/airtime-php.ini --file ${SCRIPTPATH}/include/airtime-install.php $@
+php --php-ini ${SCRIPTPATH}/airtime-php.ini ${SCRIPTPATH}/include/airtime-install.php $@
 result=$?
 if [ "$result" -eq "2" ]; then
     #We've just finished an upgrade, so let's exit

install_minimal/airtime-uninstall

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [ `whoami` != 'root' ]; then
+    echo "Please run as root user."
+    exit 1
+fi
+
 VIRTUAL_ENV_DIR="/usr/lib/airtime/airtime_virtualenv"
 if [ ! -d "$VIRTUAL_ENV_DIR" ]; then
     echo -e "\nAirtime is not installed, cannot uninstall.\n"

install_minimal/include/airtime-upgrade.php

@@ -54,28 +54,28 @@ $version = substr($version, 0, 5);
 $SCRIPTPATH = __DIR__;
 
 if (strcmp($version, "1.7.0") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.7.0/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.7.0/airtime-upgrade.php");
 }
 if (strcmp($version, "1.8.0") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.8.0/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.8.0/airtime-upgrade.php");
 }
 if (strcmp($version, "1.8.1") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.8.1/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.8.1/airtime-upgrade.php");
 }
 if (strcmp($version, "1.8.2") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.8.2/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.8.2/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.0") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.0/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.9.0/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.2") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.2/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.9.2/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.3") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.3/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.9.3/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.4") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.4/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.9.4/airtime-upgrade.php");
 }
 if (strcmp($version, "2.0.0") < 0){
     system("php ".__DIR__."/../upgrades/airtime-2.0.0/airtime-upgrade.php");

python_apps/pypo/pypofetch.py

@@ -437,10 +437,6 @@ class PypoFetch(Thread):
     def main(self):
         logger = logging.getLogger('fetch')
 
-        while not self.init_rabbit_mq():
-            logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds")
-            time.sleep(5)
-
         try: os.mkdir(self.cache_dir)
         except Exception, e: pass
 
@@ -452,6 +448,11 @@ class PypoFetch(Thread):
             self.process_schedule(self.schedule_data, "scheduler", True)
         logger.info("Bootstrap complete: got initial copy of the schedule")
 
+
+        while not self.init_rabbit_mq():
+            logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds")
+            time.sleep(5)
+
         loops = 1        
         while True:
             logger.info("Loop #%s", loops)

python_apps/pypo/pypopush.py

@@ -101,13 +101,15 @@ class PypoPush(Thread):
 
         try:
             playlist = playlists[pkey]
+            plstart = schedule[pkey]['start'][0:19]
 
             #strptime returns struct_time in local time
             #mktime takes a time_struct and returns a floating point
             #gmtime Convert a time expressed in seconds since the epoch to a struct_time in UTC
             #mktime: expresses the time in local time, not UTC. It returns a floating point number, for compatibility with time().
-            epoch_start = calendar.timegm(time.strptime(pkey, '%Y-%m-%d-%H-%M-%S'))
 
+            epoch_start = calendar.timegm(time.strptime(plstart, '%Y-%m-%d-%H-%M-%S'))
+            
             #Return the time as a floating point number expressed in seconds since the epoch, in UTC.
             epoch_now = time.time()