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

CC-3449: Live Stream: Kick out live dj at the end of the show

Browse source 
- done
This commit is contained in:
James 2012-03-28 15:12:01 -04:00
parent d12ef1c7a2
commit 4f5d7efaa1
3 changed files with 41 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
python_apps/pypo/pypofetch.py
View file

@ -376,6 +376,7 @@ class PypoFetch(Thread):
def process_schedule(self, schedule_data):
self.logger.debug(schedule_data)
media = schedule_data["media"]
media_filtered = {}
# Download all the media and put playlists in liquidsoap "annotate" format
try:
@ -391,13 +392,14 @@ class PypoFetch(Thread):
for key in media:
media_item = media[key]
fileExt = os.path.splitext(media_item['uri'])[1]
dst = os.path.join(download_dir, media_item['id']+fileExt)
media_item['dst'] = dst
if(media_item['type'] == 'file'):
fileExt = os.path.splitext(media_item['uri'])[1]
dst = os.path.join(download_dir, media_item['id']+fileExt)
media_item['dst'] = dst
media_filtered[key] = media_item
self.media_prepare_queue.put(copy.copy(media))
self.prepare_media(media)
self.media_prepare_queue.put(copy.copy(media_filtered))
self.prepare_media(media_filtered)
except Exception, e: self.logger.error("%s", e)
# Send the data to pypo-push

16
python_apps/pypo/pypopush.py
View file

@ -9,6 +9,7 @@ import telnetlib
import calendar
import json
import math
from pypofetch import PypoFetch
from Queue import Empty
@ -204,7 +205,9 @@ class PypoPush(Thread):
for mkey in sorted_keys:
media_item = media_schedule[mkey]
if len(current_chain) == 0:
if media_item['type'] == "event":
chains.append([media_item])
elif len(current_chain) == 0:
current_chain.append(media_item)
elif media_item['start'] == current_chain[-1]['end']:
current_chain.append(media_item)
@ -240,7 +243,6 @@ class PypoPush(Thread):
tnow = datetime.utcnow()
current_chain = []
for chain in chains:
iteration = 0
for link in chain:
@ -284,7 +286,13 @@ class PypoPush(Thread):
try:
for media_item in media_item_chain:
self.telnet_to_liquidsoap(media_item)
if media_item['type'] == "file":
self.telnet_to_liquidsoap(media_item)
elif media_item['type'] == "event":
if media_item['event_type'] == "kick_out":
PypoFetch.disconnect_source(self.logger, self.telnet_lock, "live_dj")
elif media_item['event_type'] == "switch_off":
PypoFetch.switch_source(self.logger, self.telnet_lock, "live_dj", "off")
except Exception, e:
self.logger.error('Pypo Push Exception: %s', e)
@ -400,7 +408,7 @@ class PypoPush(Thread):
def create_liquidsoap_annotation(self, media):
return 'annotate:media_id="%s",liq_cue_in="%s",liq_cue_out="%s",schedule_table_id="%s":%s' \
% (media['id'], float(media['cue_in']), float(media['cue_out']), media['row_id'], media['dst'])
def run(self):
try: self.main()
except Exception, e: