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

CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW

Browse source 
-fixed
This commit is contained in:
Martin Konecny 2012-04-26 14:46:29 -04:00
parent a9d125bc4d
commit b3816061b9
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
python_apps/pypo/pypopush.py
View file

@ -73,7 +73,7 @@ class PypoPush(Thread):
if len(current_event_chain) > 0 and len(liquidsoap_queue_approx) == 0: if len(current_event_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..this might happen if Liquidsoap crashed. #Need to schedule it immediately..this might happen if Liquidsoap crashed.
self.modify_cue_point_of_first_link(current_event_chain) self.modify_cue_point(current_event_chain[0])
next_media_item_chain = current_event_chain next_media_item_chain = current_event_chain
time_until_next_play = 0 time_until_next_play = 0
else: else:
@ -176,8 +176,11 @@ class PypoPush(Thread):
if problem_at_iteration is not None: if problem_at_iteration is not None:
self.logger.debug("Change in chain at link %s", problem_at_iteration) self.logger.debug("Change in chain at link %s", problem_at_iteration)
#self.modify_cue_point_of_first_link(media_chain)
self.push_to_liquidsoap(media_chain[problem_at_iteration:]) chain_to_push = media_chain[problem_at_iteration:]
if len(chain_to_push) > 0:
self.modify_cue_point(chain_to_push[0])
self.push_to_liquidsoap(chain_to_push)
""" """
Compare whats in the liquidsoap_queue to the new schedule we just Compare whats in the liquidsoap_queue to the new schedule we just
@ -246,24 +249,19 @@ class PypoPush(Thread):
return chains return chains
def modify_cue_point_of_first_link(self, chain): def modify_cue_point(self, link):
tnow = datetime.utcnow() tnow = datetime.utcnow()
link = chain[0]
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_td = tnow - link_start diff_td = tnow - link_start
diff_sec = self.convert_timedelta_to_seconds(diff_td) diff_sec = self.date_interval_to_seconds(diff_td)
if diff_sec > 0: if diff_sec > 0:
self.logger.debug("media item was supposed to start %s ago. Preparing to start..", diff_sec) self.logger.debug("media item was supposed to start %s ago. Preparing to start..", diff_sec)
original_cue_in_td = timedelta(seconds=float(link['cue_in'])) original_cue_in_td = timedelta(seconds=float(link['cue_in']))
link['cue_in'] = self.convert_timedelta_to_seconds(original_cue_in_td) + diff_sec link['cue_in'] = self.date_interval_to_seconds(original_cue_in_td) + diff_sec
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):
tnow = datetime.utcnow() tnow = datetime.utcnow()