Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-3346: Recorder: Merge recorder with pypo

Browse source 
- function parse_show was renamed to process_recorder_schedule
- using thread on self.process_schedule call
This commit is contained in:
james 2012-02-25 09:44:33 -05:00 • committed by James
parent 31abc21aaa
commit 91ef7f7669
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
python_apps/pypo/pypofetch.py
View file

@ -15,6 +15,7 @@ from subprocess import Popen, PIPE
from datetime import datetime from datetime import datetime
from datetime import timedelta from datetime import timedelta
import filecmp import filecmp
import thread
# For RabbitMQ # For RabbitMQ
from kombu.connection import BrokerConnection from kombu.connection import BrokerConnection
@ -82,7 +83,7 @@ class PypoFetch(Thread):
if command == 'update_schedule': if command == 'update_schedule':
self.schedule_data = m['schedule'] self.schedule_data = m['schedule']
self.process_schedule(self.schedule_data, "scheduler", False) thread.start_new_thread(self.process_schedule, (self.schedule_data, "scheduler", False))
elif command == 'update_stream_setting': elif command == 'update_stream_setting':
logger.info("Updating stream setting...") logger.info("Updating stream setting...")
self.regenerateLiquidsoapConf(m['setting']) self.regenerateLiquidsoapConf(m['setting'])
@ -98,7 +99,7 @@ class PypoFetch(Thread):
elif command == 'update_recorder_schedule': elif command == 'update_recorder_schedule':
temp = m temp = m
if temp is not None: if temp is not None:
self.parse_shows(temp) self.process_recorder_schedule(temp)
elif command == 'cancel_recording': elif command == 'cancel_recording':
self.recorder_queue.put('cancel_recording') self.recorder_queue.put('cancel_recording')
except Exception, e: except Exception, e:
@ -330,7 +331,7 @@ class PypoFetch(Thread):
return datetime(date[0], date[1], date[2], time[0], time[1], time[2], 0, None) return datetime(date[0], date[1], date[2], time[0], time[1], time[2], 0, None)
def parse_shows(self, m): def process_recorder_schedule(self, m):
logger = logging.getLogger('fetch') logger = logging.getLogger('fetch')
logger.info("Parsing recording show schedules...") logger.info("Parsing recording show schedules...")
shows_to_record = {} shows_to_record = {}
@ -517,14 +518,14 @@ class PypoFetch(Thread):
status, self.schedule_data = self.api_client.get_schedule() status, self.schedule_data = self.api_client.get_schedule()
if status == 1: if status == 1:
logger.info("Bootstrap schedule received: %s", self.schedule_data) logger.info("Bootstrap schedule received: %s", self.schedule_data)
self.process_schedule(self.schedule_data, "scheduler", True) thread.start_new_thread(self.process_schedule, (self.schedule_data, "scheduler", True))
# Bootstrap: since we are just starting up, we need to grab the # Bootstrap: since we are just starting up, we need to grab the
# most recent schedule. After that we can just wait for updates. # most recent schedule. After that we can just wait for updates.
try: try:
temp = self.api_client.get_shows_to_record() temp = self.api_client.get_shows_to_record()
if temp is not None: if temp is not None:
self.parse_shows(temp) self.process_recorder_schedule(temp)
logger.info("Bootstrap recorder schedule received: %s", temp) logger.info("Bootstrap recorder schedule received: %s", temp)
except Exception, e: except Exception, e:
logger.error(e) logger.error(e)
@ -556,14 +557,14 @@ class PypoFetch(Thread):
status, self.schedule_data = self.api_client.get_schedule() status, self.schedule_data = self.api_client.get_schedule()
if status == 1: if status == 1:
self.process_schedule(self.schedule_data, "scheduler", False) thread.start_new_thread(self.process_schedule, (self.schedule_data, "scheduler", False))
""" """
Fetch recorder schedule Fetch recorder schedule
""" """
try: try:
temp = self.api_client.get_shows_to_record() temp = self.api_client.get_shows_to_record()
if temp is not None: if temp is not None:
self.parse_shows(temp) self.process_recorder_schedule(temp)
logger.info("updated recorder schedule received: %s", temp) logger.info("updated recorder schedule received: %s", temp)
except Exception, e: except Exception, e:
logger.error(e) logger.error(e)