Pypo: Live Streaming in first show will block the next show's first track

-fixed. Was caused by clashing keys
This commit is contained in:
Martin Konecny 2013-05-30 14:02:05 -04:00
parent 13f7c3941d
commit 6fddabdd7c
3 changed files with 10 additions and 6 deletions

View File

@ -441,9 +441,11 @@ class PypoFetch(Thread):
media_item['file_ready'] = False
media_filtered[key] = media_item
media_item['start'] = datetime.strptime(media_item['start'], "%Y-%m-%d-%H-%M-%S")
media_item['end'] = datetime.strptime(media_item['end'], "%Y-%m-%d-%H-%M-%S")
media_copy[media_item['start']] = media_item
media_item['start'] = datetime.strptime(media_item['start'],
"%Y-%m-%d-%H-%M-%S")
media_item['end'] = datetime.strptime(media_item['end'],
"%Y-%m-%d-%H-%M-%S")
media_copy[key] = media_item
self.media_prepare_queue.put(copy.copy(media_filtered))

View File

@ -61,8 +61,10 @@ class PypoLiqQueue(Thread):
schedule_deque.append(media_schedule[i])
if len(keys):
time_until_next_play = self.date_interval_to_seconds(\
keys[0] - datetime.utcnow())
time_until_next_play = self.date_interval_to_seconds(
media_schedule[keys[0]]['start'] -
datetime.utcnow())
else:
time_until_next_play = None

View File

@ -110,7 +110,7 @@ class PypoPush(Thread):
if diff_sec >= 0:
present.append(media_item)
else:
future[media_item['start']] = media_item
future[mkey] = media_item
return present, future