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

cc-3476: detect if Liquidsoap is not playing something when it should and fix it

Browse source
This commit is contained in:
Martin Konecny 2012-03-23 18:33:44 -04:00
parent 118590ef30
commit 269096b9e8
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
python_apps/pypo/pypopush.py
View file

@ -75,12 +75,13 @@ class PypoPush(Thread):
if len(current_chain) > 0 and len(liquidsoap_queue_approx) == 0: if len(current_chain) > 0 and len(liquidsoap_queue_approx) == 0:
#Something is scheduled but Liquidsoap is not playing anything! #Something is scheduled but Liquidsoap is not playing anything!
#Need to schedule it immediately #Need to schedule it immediately
modify_cue_point_of_first_link(current_chain) self.modify_cue_point_of_first_link(current_chain)
next_media_item_chain = current_chain next_media_item_chain = current_chain
time_until_next_play = 0 time_until_next_play = 0
else: else:
self.handle_new_media_schedule(media_schedule, liquidsoap_queue_approx) self.handle_new_media_schedule(media_schedule, liquidsoap_queue_approx)
next_media_item_chain = self.get_next_schedule_chain(media_schedule) chains = self.get_all_chains(media_schedule)
next_media_item_chain = self.get_next_schedule_chain(chains)
self.logger.debug("Next schedule chain: %s", next_media_item_chain) self.logger.debug("Next schedule chain: %s", next_media_item_chain)
if next_media_item_chain is not None: if next_media_item_chain is not None:
tnow = datetime.utcnow() tnow = datetime.utcnow()
@ -224,12 +225,15 @@ class PypoPush(Thread):
link_start = datetime.strptime(link['start'], "%Y-%m-%d-%H-%M-%S") link_start = datetime.strptime(link['start'], "%Y-%m-%d-%H-%M-%S")
diff = tnow - link_start diff_td = tnow - link_start
self.logger.debug("media item was supposed to start %s ago. Preparing to start..", diff) self.logger.debug("media item was supposed to start %s ago. Preparing to start..", diff_td)
link['cue_in'] = link['cue_in'] + diff original_cue_in_td = timedelta(seconds=float(link['cue_in']))
link['cue_in'] = self.convert_timedelta_to_seconds(original_cue_in_td + diff_td)
def convert_timedelta_to_seconds(self, td):
return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
def get_current_chain(self, chains): def get_current_chain(self, chains):
@ -260,7 +264,6 @@ class PypoPush(Thread):
def get_next_schedule_chain(self, chains): def get_next_schedule_chain(self, chains):
#all media_items are now divided into chains. Let's find the one that #all media_items are now divided into chains. Let's find the one that
#starts closest in the future. #starts closest in the future.
tnow = datetime.utcnow() tnow = datetime.utcnow()
closest_start = None closest_start = None
closest_chain = None closest_chain = None
@ -401,5 +404,7 @@ class PypoPush(Thread):
def run(self): def run(self):
try: self.main() try: self.main()
except Exception, e: except Exception, e:
self.logger.error('Pypo Push Exception: %s', e) import traceback
top = traceback.format_exc()
self.logger.error('Pypo Push Exception: %s', top)