Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x

airtime_mvc/public/js/airtime/showbuilder/builder.js

@@ -699,7 +699,7 @@ var AIRTIME = (function(AIRTIME){
                     if (temp.length > 0) {
                         aData = temp.data("aData");
                         // max time interval
-						// setTimeout allow only up to 2^21 millisecs timeout value
+						// setTimeout allows only up to (2^31)-1 millisecs timeout value
 						maxRefreshInterval = Math.pow(2, 31) - 1;
 						refreshInterval = aData.refresh * 1000;
 						if(refreshInterval > maxRefreshInterval){

install_minimal/include/airtime-install.php

@@ -61,6 +61,16 @@ AirtimeInstall::InstallStorageDirectory();
 
 $db_install = getenv("nodb")!="t";
 if ($db_install) {
+    
+    echo "* Checking database for correct encoding".PHP_EOL;
+    exec('su -c \'psql -t -c "SHOW SERVER_ENCODING"\' postgres | grep -i "UTF.*8"', $out, $return_code);
+    if ($return_code != 0){
+        echo " * Unfortunately your postgresql database has not been created using a UTF-8 encoding.".PHP_EOL;
+        echo " * As of Airtime 2.1, installs will fail unless the encoding has been set to UTF-8. Please verify this is the case".PHP_EOL;
+        echo " * and try the install again".PHP_EOL;
+        exit(1);
+    }
+    
     if($newInstall) {
         //call external script. "y" argument means force creation of database tables.
         passthru('php '.__DIR__.'/airtime-db-install.php y');

python_apps/pypo/install/pypo-initialize.py

@@ -109,20 +109,6 @@ try:
         print e
         sys.exit(1)
     
-    """
-    logging.basicConfig(format='%(message)s')
-            
-    #generate liquidsoap config file
-    #access the DB and generate liquidsoap.cfg under /etc/airtime/
-    ac = api_client.api_client_factory(config, logging.getLogger())
-    ss = ac.get_stream_setting()
-    
-    if ss is not None:
-        generate_liquidsoap_config(ss)
-    else:
-        print "Unable to connect to the Airtime server."
-    """
-
     #initialize init.d scripts
     subprocess.call("update-rc.d airtime-playout defaults >/dev/null 2>&1", shell=True)
 

python_apps/pypo/liquidsoap_scripts/notify.sh

@@ -10,4 +10,4 @@ SCRIPT=`readlink -f $0`
 # Absolute path this script is in
 SCRIPTPATH=`dirname $SCRIPT`
 
-cd ${SCRIPTPATH}/../ && python pypo-notify.py "$@"
+cd ${SCRIPTPATH}/../ && python pyponotify.py "$@"

python_apps/pypo/pypocli.py

@@ -3,12 +3,10 @@ Python part of radio playout (pypo)
 """
 
 import time
-from optparse import *
+from optparse import OptionParser
 import sys
 import signal
 import logging
-import logging.config
-import logging.handlers
 import locale
 import os
 from Queue import Queue

python_apps/pypo/pypofetch.py

@@ -3,9 +3,7 @@
 import os
 import sys
 import time
-import logging
 import logging.config
-import shutil
 import json
 import telnetlib
 import copy
@@ -458,9 +456,9 @@ class PypoFetch(Thread):
         unneeded_files = cached_file_set - scheduled_file_set
 
         self.logger.debug("Files to remove " + str(unneeded_files))
-        for file in unneeded_files:
-            self.logger.debug("Removing %s" % os.path.join(self.cache_dir, file))
-            os.remove(os.path.join(self.cache_dir, file))
+        for f in unneeded_files:
+            self.logger.debug("Removing %s" % os.path.join(self.cache_dir, f))
+            os.remove(os.path.join(self.cache_dir, f))
 
     def main(self):
         # Bootstrap: since we are just starting up, we need to grab the

python_apps/pypo/pypofile.py

@@ -5,7 +5,6 @@ from Queue import Empty
 from configobj import ConfigObj
 
 import logging
-import logging.config
 import shutil
 import os
 import sys

python_apps/pypo/pypomessagehandler.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import logging.config
 import sys
 from configobj import ConfigObj
 from threading import Thread
@@ -126,10 +125,8 @@ class PypoMessageHandler(Thread):
                 There is a problem with the RabbitMq messenger service. Let's
                 log the error and get the schedule via HTTP polling
                 """
-                import traceback
-                top = traceback.format_exc()
                 self.logger.error('Exception: %s', e)
-                self.logger.error("traceback: %s", top)
+                self.logger.error("traceback: %s", traceback.format_exc())
 
             loops += 1
 

python_apps/pypo/pyponotify.py

@@ -15,19 +15,9 @@ Main case:
 
 """
 
-# python defaults (debian default)
-import time
-import os
-import traceback
-from optparse import *
+from optparse import OptionParser
 import sys
-import time
-import datetime
-import logging
 import logging.config
-import urllib
-import urllib2
-import string
 import json
 
 # additional modules (should be checked)
@@ -38,9 +28,6 @@ from configobj import ConfigObj
 from api_clients import *
 from std_err_override import LogWriter
 
-# Set up command-line options
-parser = OptionParser()
-
 # help screeen / info
 usage = "%prog [options]" + " - notification gateway"
 parser = OptionParser(usage=usage)
@@ -60,7 +47,7 @@ parser.add_option("-y", "--source-status", help="source connection stauts", meta
 
 # configure logging
 logging.config.fileConfig("logging.cfg")
-logger = logging.getLogger()
+logger = logging.getLogger('notify')
 LogWriter.override_std_err(logger)
 
 #need to wait for Python 2.7 for this..

python_apps/pypo/pypopush.py

@@ -5,11 +5,9 @@ from datetime import timedelta
 
 import sys
 import time
-import logging
 import logging.config
 import telnetlib
 import calendar
-import json
 import math
 from pypofetch import PypoFetch
 
@@ -170,7 +168,7 @@ class PypoPush(Thread):
         queue.
         """
 
-        problem_at_iteration, problem_start_time = self.find_removed_items(media_schedule, liquidsoap_queue_approx)
+        problem_at_iteration = self.find_removed_items(media_schedule, liquidsoap_queue_approx)
 
         if problem_at_iteration is not None:
             #Items that are in Liquidsoap's queue aren't scheduled anymore. We need to connect
@@ -201,7 +199,6 @@ class PypoPush(Thread):
         #see if they are the same as the newly received schedule
         iteration = 0
         problem_at_iteration = None
-        problem_start_time = None
         for queue_item in liquidsoap_queue_approx:
             if queue_item['start'] in media_schedule.keys():
                 media_item = media_schedule[queue_item['start']]
@@ -211,23 +208,20 @@ class PypoPush(Thread):
                         pass
                     else:
                         problem_at_iteration = iteration
-                        problem_start_time = queue_item['start']
                         break
                 else:
                     #A different item has been scheduled at the same time! Need to remove
                     #all tracks from the Liquidsoap queue starting at this point, and re-add
                     #them. 
                     problem_at_iteration = iteration
-                    problem_start_time = queue_item['start']
                     break
             else:
                 #There are no more items scheduled for this time! The user has shortened
                 #the playlist, so we simply need to remove tracks from the queue. 
                 problem_at_iteration = iteration
-                problem_start_time = queue_item['start']
                 break
             iteration += 1
-        return (problem_at_iteration, problem_start_time)
+        return problem_at_iteration
 
 
 

python_apps/pypo/recorder.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import logging.config
 import json
 import time
 import datetime