CC-5990, CC-5991 - Python cleanup, removed need for /usr/lib/airtime

python_apps/pypo/bin/airtime-liquidsoap

@@ -1,38 +1,3 @@
 #!/bin/bash -e
 
-debug="f"
-
-showhelp () {
-    echo "Usage: airtime-liquidsoap [options]
---help|-h                         Displays usage information.
---debug|-d                        Print error messages to console" 
-}
-
-set -- $(getopt -l help,debug "hd" "$@")
-while [ $# -gt 0 ]
-do
-    case "$1" in
-    (-h|--help) showhelp; exit 0;;
-    (-d|--debug) debug="t";;
-    
-    (--) shift; break;;
-    (-*) echo "$0: error - unrecognized option $1" 1>&2; exit 1;;
-    (*)  break;;
-    esac
-    shift
-done
-
-export HOME="/var/tmp/airtime/pypo/"
-if [ "$debug" = "t" ]; then
-    ls_path="/usr/bin/airtime-liquidsoap --verbose -f --debug"
-else
-    ls_path="/usr/bin/airtime-liquidsoap --verbose -f"
-fi
-
-export PYTHONPATH=/usr/lib/airtime/:/usr/lib/airtime/pypo/bin/:/usr/lib/airtime/std_err_override/:/usr/lib/airtime/api_clients:$PYTHONPATH
-ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq"
-
-cd /usr/lib/airtime/pypo/bin/liquidsoap_scripts
-python generate_liquidsoap_cfg.py
-
-exec ${ls_path} ${ls_param} 2>&1
+exec python -m liquidsoap 2>&1

python_apps/pypo/bin/airtime-playout

@@ -9,8 +9,7 @@ if [ "$?" != "0" ]; then
 fi
 
 export HOME="/var/tmp/airtime/pypo/"
-export PYTHONPATH=/usr/lib/airtime/:/usr/lib/airtime/pypo/bin/:/usr/lib/airtime/std_err_override/:/usr/lib/airtime/api_clients:$PYTHONPATH
 export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""`
 export TERM=xterm
 
-exec python /usr/lib/airtime/pypo/bin/pypocli.py > /var/log/airtime/pypo/py-interpreter.log 2>&1
+exec python -m pypo > /var/log/airtime/pypo/py-interpreter.log 2>&1

python_apps/pypo/bin/pyponotify

@@ -0,0 +1,140 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import traceback
+
+"""
+Python part of radio playout (pypo)
+
+This function acts as a gateway between liquidsoap and the server API.
+Mainly used to tell the platform what pypo/liquidsoap does.
+
+Main case:
+ - whenever LS starts playing a new track, its on_metadata callback calls
+   a function in ls (notify(m)) which then calls the python script here
+   with the currently starting filename as parameter
+ - this python script takes this parameter, tries to extract the actual
+   media id from it, and then calls back to the API to tell about it about it.
+
+"""
+
+from optparse import OptionParser
+import sys
+import logging.config
+import json
+
+# additional modules (should be checked)
+from configobj import ConfigObj
+
+# custom imports
+#from util import *
+from api_clients import *
+from std_err_override import LogWriter
+
+# help screeen / info
+usage = "%prog [options]" + " - notification gateway"
+parser = OptionParser(usage=usage)
+
+# Options
+parser.add_option("-d", "--data", help="Pass JSON data from Liquidsoap into this script.", metavar="data")
+parser.add_option("-m", "--media-id", help="ID of the file that is currently playing.", metavar="media_id")
+parser.add_option("-e", "--error", action="store", dest="error", type="string", help="Liquidsoap error msg.", metavar="error_msg")
+parser.add_option("-s", "--stream-id", help="ID stream", metavar="stream_id")
+parser.add_option("-c", "--connect", help="Liquidsoap connected", action="store_true", metavar="connect")
+parser.add_option("-t", "--time", help="Liquidsoap boot up time", action="store", dest="time", metavar="time", type="string")
+parser.add_option("-x", "--source-name", help="source connection name", metavar="source_name")
+parser.add_option("-y", "--source-status", help="source connection status", metavar="source_status")
+parser.add_option("-w", "--webstream", help="JSON metadata associated with webstream", metavar="json_data")
+parser.add_option("-n", "--liquidsoap-started", help="notify liquidsoap started", metavar="json_data", action="store_true", default=False)
+
+
+# parse options
+(options, args) = parser.parse_args()
+
+# configure logging
+logging.config.fileConfig("notify_logging.cfg")
+logger = logging.getLogger('notify')
+LogWriter.override_std_err(logger)
+
+#need to wait for Python 2.7 for this..
+#logging.captureWarnings(True)
+
+# loading config file
+try:
+    config = ConfigObj('/etc/airtime/airtime.conf')
+
+except Exception, e:
+    logger.error('Error loading config file: %s', e)
+    sys.exit()
+
+
+class Notify:
+    def __init__(self):
+        self.api_client = api_client.AirtimeApiClient(logger=logger)
+
+    def notify_liquidsoap_started(self):
+        logger.debug("Notifying server that Liquidsoap has started")
+        self.api_client.notify_liquidsoap_started()
+
+    def notify_media_start_playing(self, media_id):
+        logger.debug('#################################################')
+        logger.debug('# Calling server to update about what\'s playing #')
+        logger.debug('#################################################')
+        response = self.api_client.notify_media_item_start_playing(media_id)
+        logger.debug("Response: " + json.dumps(response))
+
+    # @pram time: time that LS started
+    def notify_liquidsoap_status(self, msg, stream_id, time):
+        logger.debug('#################################################')
+        logger.debug('# Calling server to update liquidsoap status    #')
+        logger.debug('#################################################')
+        logger.debug('msg = ' + str(msg))
+        response = self.api_client.notify_liquidsoap_status(msg, stream_id, time)
+        logger.debug("Response: " + json.dumps(response))
+
+    def notify_source_status(self, source_name, status):
+        logger.debug('#################################################')
+        logger.debug('# Calling server to update source status        #')
+        logger.debug('#################################################')
+        logger.debug('msg = ' + str(source_name) + ' : ' + str(status))
+        response = self.api_client.notify_source_status(source_name, status)
+        logger.debug("Response: " + json.dumps(response))
+
+    def notify_webstream_data(self, data, media_id):
+        logger.debug('#################################################')
+        logger.debug('# Calling server to update webstream data       #')
+        logger.debug('#################################################')
+        response = self.api_client.notify_webstream_data(data, media_id)
+        logger.debug("Response: " + json.dumps(response))
+
+    def run_with_options(self, options):
+        if options.error and options.stream_id:
+            self.notify_liquidsoap_status(options.error, options.stream_id, options.time)
+        elif options.connect and options.stream_id:
+            self.notify_liquidsoap_status("OK", options.stream_id, options.time)
+        elif options.source_name and options.source_status:
+            self.notify_source_status(options.source_name, options.source_status)
+        elif options.webstream:
+            self.notify_webstream_data(options.webstream, options.media_id)
+        elif options.media_id:
+            self.notify_media_start_playing(options.media_id)
+        elif options.liquidsoap_started:
+            self.notify_liquidsoap_started()
+        else:
+            logger.debug("Unrecognized option in options(%s). Doing nothing" \
+                  % str(options))
+
+
+if __name__ == '__main__':
+    print
+    print '#########################################'
+    print '#           *** pypo  ***               #'
+    print '#     pypo notification gateway         #'
+    print '#########################################'
+
+    # initialize
+    try:
+        n = Notify()
+        n.run_with_options(options)
+    except Exception as e:
+        print( traceback.format_exc() )
+