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

CC-3525: Pypo needs to look at end time of each track when receiving a new schedule

This commit is contained in:
Martin Konecny 2012-04-07 22:29:26 -04:00
parent 548c4ffb8d
commit e549e997ae
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
python_apps/pypo/pypopush.py
View File

@ -183,9 +183,14 @@ class PypoPush(Thread):
problem_at_iteration = None problem_at_iteration = None
for queue_item in liquidsoap_queue_approx: for queue_item in liquidsoap_queue_approx:
if queue_item['start'] in media_schedule.keys(): if queue_item['start'] in media_schedule.keys():
if queue_item['id'] == media_schedule[queue_item['start']]['id']: media_item = media_schedule[queue_item['start']]
#Everything OK for this iteration. if queue_item['id'] == media_item['id']:
pass if queue_item['end'] == media_item['end']:
#Everything OK for this iteration.
pass
else:
problem_at_iteration = iteration
break
else: else:
#A different item has been scheduled at the same time! Need to remove #A different item has been scheduled at the same time! Need to remove
#all tracks from the Liquidsoap queue starting at this point, and re-add #all tracks from the Liquidsoap queue starting at this point, and re-add
@ -204,7 +209,7 @@ class PypoPush(Thread):
#The first item in the Liquidsoap queue (the one that is currently playing) #The first item in the Liquidsoap queue (the one that is currently playing)
#has changed or been removed from the schedule. We need to clear the entire #has changed or been removed from the schedule. We need to clear the entire
#queue, and push the new schedule #queue, and push the new schedule
self.logger.debug("Problem at iteration %s", problem_at_iteration) self.logger.debug("Change in link %s of current chain", problem_at_iteration)
self.remove_from_liquidsoap_queue(problem_at_iteration, liquidsoap_queue_approx) self.remove_from_liquidsoap_queue(problem_at_iteration, liquidsoap_queue_approx)
return problem_at_iteration return problem_at_iteration