CC-2097: Show-recorder: Use RabbitMQ, api_client, and the structure of pypofetch

using api client now

python_apps/api_clients/api_client.py

@@ -13,6 +13,7 @@
 import sys
 import time
 import urllib
+import urllib2
 import logging
 import json
 import os
@@ -90,6 +91,12 @@ class ApiClientInterface:
     # You will be able to use this data in update_start_playing
     def get_liquidsoap_data(self, pkey, schedule):
         pass
+
+    def get_shows_to_record(self):
+        pass
+
+    def upload_recorded_show(self):
+        pass
         
     # Put here whatever tests you want to run to make sure your API is working
     def test(self):
@@ -225,24 +232,6 @@ class AirTimeApiClient(ApiClientInterface):
         except Exception, e:
             print e
 
-        #schedule = response["playlists"]
-        #scheduleKeys = sorted(schedule.iterkeys())
-        #
-        ## Remove all playlists that have passed current time
-        #try:
-        #   tnow = time.localtime(time.time())
-        #   str_tnow_s = "%04d-%02d-%02d-%02d-%02d-%02d" % (tnow[0], tnow[1], tnow[2], tnow[3], tnow[4], tnow[5])
-        #   toRemove = []
-        #   for pkey in scheduleKeys:
-        #       if (str_tnow_s > schedule[pkey]['end']):
-        #           toRemove.append(pkey)
-        #       else:
-        #           break
-        #   for index in toRemove:
-        #       del schedule[index]
-        #except Exception, e:
-        #response["playlists"] = schedule
-
         return status, response
 
 
@@ -316,6 +305,42 @@ class AirTimeApiClient(ApiClientInterface):
         except Exception, e:
             data["schedule_id"] = 0
         return data
+
+    def get_shows_to_record(self):
+        logger = logging.getLogger()
+        response = ''
+        try:
+            url = self.config["base_url"] + self.config["api_base"] + self.config["show_schedule_url"]
+            #logger.debug(url)
+            url = url.replace("%%api_key%%", self.config["api_key"])
+            logger.debug(url)
+            response = urllib.urlopen(url)
+            response = json.loads(response.read())
+            logger.info("shows %s", response)
+        
+        except Exception, e:
+            logger.error("Exception: %s", e)
+        
+        return response[u'shows']
+
+    def upload_recorded_show(self, data, headers):
+        logger = logging.getLogger()
+        response = ''
+        try:
+            url = self.config["base_url"] + self.config["api_base"] + self.config["upload_file_url"]
+            #logger.debug(url)
+            url = url.replace("%%api_key%%", self.config["api_key"])
+            logger.debug(url)
+
+            request = urllib2.Request(url, data, headers)
+            response = urllib2.urlopen(request).read().strip()
+
+            logger.info("uploaded show result %s", response)
+        
+        except Exception, e:
+            logger.error("Exception: %s", e)
+        
+        return response
     
 
         

python_apps/show-recorder/config.cfg

@@ -1,10 +1,8 @@
+api_client = "airtime"
+
 # Hostname
 base_url = 'http://localhost/'
 
-show_schedule_url = 'Recorder/get-show-schedule/format/json'
-
-upload_file_url = 'Plupload/upload-recorded/format/json'
-
 # base path to store recordered shows at
 base_recorded_files = '/home/pypo/Music/'
 
@@ -16,3 +14,9 @@ api_base = 'api/'
 
 # URL to get the version number of the server API
 version_url = 'version/api_key/%%api_key%%'
+
+# URL to get the schedule of shows set to record
+show_schedule_url = 'recorded-shows/format/json/api_key/%%api_key%%'
+
+# URL to upload the recorded show's file to Airtime
+upload_file_url = 'upload-recorded/format/json/api_key/%%api_key%%'

python_apps/show-recorder/install/recorder-daemontools.sh

@@ -4,9 +4,12 @@ export HOME="/home/pypo/"
 # Location of pypo_cli.py Python script
 recorder_path="/opt/recorder/bin/"
 recorder_script="testrecordscript.py"
+
+api_client_path="/opt/pypo/"
+
 echo "*** Daemontools: starting daemon"
 cd ${recorder_path}
 exec 2>&1
 # Note the -u when calling python! we need it to get unbuffered binary stdout and stderr
-exec sudo python -u ${recorder_path}${recorder_script} -f
+sudo PYTHONPATH=${api_client_path} -u ${recorder_user} python -u ${recorder_path}${recorder_script} -f
 # EOF

python_apps/show-recorder/logging.cfg

@@ -0,0 +1,22 @@
+[loggers]
+keys=root
+
+[handlers]
+keys=consoleHandler
+
+[formatters]
+keys=simpleFormatter
+
+[logger_root]
+level=DEBUG
+handlers=consoleHandler
+
+[handler_consoleHandler]
+class=StreamHandler
+level=DEBUG
+formatter=simpleFormatter
+args=(sys.stdout,)
+
+[formatter_simpleFormatter]
+format=%(asctime)s %(levelname)s - [%(filename)s : %(funcName)s() : line %(lineno)d] - %(message)s
+datefmt=

python_apps/show-recorder/testrecordscript.py

@@ -1,6 +1,7 @@
 #!/usr/local/bin/python
 import urllib
 import logging
+import logging.config
 import json
 import time
 import datetime
@@ -15,6 +16,15 @@ import urllib2
 from subprocess import call
 from threading import Thread
 
+# For RabbitMQ
+from kombu.connection import BrokerConnection
+from kombu.messaging import Exchange, Queue, Consumer, Producer
+
+from api_clients import api_client
+
+# configure logging
+logging.config.fileConfig("logging.cfg")
+
 # loading config file
 try:
     config = ConfigObj('config.cfg')
@@ -22,12 +32,19 @@ except Exception, e:
     print 'Error loading config file: ', e
     sys.exit()
 
-shows_to_record = {}
+def getDateTimeObj(time):
 
-class Recorder(Thread):
+    timeinfo = time.split(" ")
+    date = timeinfo[0].split("-")
+    time = timeinfo[1].split(":")
+
+    return datetime.datetime(int(date[0]), int(date[1]), int(date[2]), int(time[0]), int(time[1]), int(time[2])) 
+
+class ShowRecorder(Thread):
 
     def __init__ (self, show_instance, filelength, filename, filetype):
         Thread.__init__(self)
+        self.api_client = api_client.api_client_factory(config)
         self.filelength = filelength
         self.filename = filename
         self.filetype = filetype
@@ -55,83 +72,73 @@ class Recorder(Thread):
         # datagen is a generator object that yields the encoded parameters
         datagen, headers = multipart_encode({"file": open(filepath, "rb"), 'name': filename, 'show_instance': self.show_instance})
 
-        url = config["base_url"] + config["upload_file_url"]
-       
-        req = urllib2.Request(url, datagen, headers)
-        response = urllib2.urlopen(req).read().strip()
-        print response
+        self.api_client.upload_recorded_show(datagen, headers)
 
     def run(self):
         filepath = self.record_show()
         self.upload_file(filepath)
 
 
-def getDateTimeObj(time):
+class Record():
 
-    timeinfo = time.split(" ")
-    date = timeinfo[0].split("-")
-    time = timeinfo[1].split(":")
+    def __init__(self):
+        self.api_client = api_client.api_client_factory(config) 
+        self.shows_to_record = {}  
 
-    return datetime.datetime(int(date[0]), int(date[1]), int(date[2]), int(time[0]), int(time[1]), int(time[2]))    
+    def process_shows(self, shows):
 
-def process_shows(shows):
-
-    global shows_to_record
-    shows_to_record = {}
-    
-    for show in shows:
-        show_starts = getDateTimeObj(show[u'starts'])
-        show_end = getDateTimeObj(show[u'ends'])
-        time_delta = show_end - show_starts
+        self.shows_to_record = {}
         
-        shows_to_record[show[u'starts']] = [time_delta, show[u'instance_id']]
+        for show in shows:
+            show_starts = getDateTimeObj(show[u'starts'])
+            show_end = getDateTimeObj(show[u'ends'])
+            time_delta = show_end - show_starts
+            
+            self.shows_to_record[show[u'starts']] = [time_delta, show[u'instance_id']]
 
 
-def check_record():
-    
-    tnow = datetime.datetime.now()
-    sorted_show_keys = sorted(shows_to_record.keys())
-    print sorted_show_keys
-    start_time = sorted_show_keys[0]
-    next_show = getDateTimeObj(start_time)
+    def check_record(self):
+        
+        tnow = datetime.datetime.now()
+        sorted_show_keys = sorted(self.shows_to_record.keys())
+        print sorted_show_keys
+        start_time = sorted_show_keys[0]
+        next_show = getDateTimeObj(start_time)
 
-    print next_show
-    print tnow
-    delta = next_show - tnow
-    print delta    
+        print next_show
+        print tnow
 
-    if delta <= datetime.timedelta(seconds=60):
-        print "sleeping %s seconds until show" % (delta.seconds)
-        time.sleep(delta.seconds)
-       
-        show_length = shows_to_record[start_time][0]
-        show_instance = shows_to_record[start_time][1]
-        show = Recorder(show_instance, show_length.seconds, start_time, filetype="mp3")
-        show.start()
-     
-        #remove show from shows to record.
-        del shows_to_record[start_time]
-    
+        delta = next_show - tnow
+        min_delta = datetime.timedelta(seconds=60)
 
-def get_shows():
+        if delta <= min_delta:
+            print "sleeping %s seconds until show" % (delta.seconds)
+            time.sleep(delta.seconds)
+           
+            show_length = self.shows_to_record[start_time][0]
+            show_instance = self.shows_to_record[start_time][1]
+            show = ShowRecorder(show_instance, show_length.seconds, start_time, filetype="mp3")
+            show.start()
+         
+            #remove show from shows to record.
+            del self.shows_to_record[start_time]
+        
 
-    url = config["base_url"] + config["show_schedule_url"]
-    response = urllib.urlopen(url)
-    data = response.read()
-   
-    response_json = json.loads(data)
-    shows = response_json[u'shows']
-    print shows
+    def get_shows(self):
 
-    if len(shows):
-        process_shows(shows)
-        check_record() 
+        shows = self.api_client.get_shows_to_record()
+
+        if len(shows):
+            self.process_shows(shows)
+            self.check_record() 
 
 
 if __name__ == '__main__':
 
+    recorder = Record()
+
     while True:
-        get_shows()
+        recorder.get_shows()
         time.sleep(5)