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

Merge branch '2.4.x'

Browse source 
Conflicts:
	python_apps/pypo/pypopush.py
	python_apps/pypo/schedule/pypofetch.py
	python_apps/pypo/schedule/pypofile.py
	python_apps/pypo/schedule/pypoliqqueue.py
This commit is contained in:
denise 2013-05-30 15:21:32 -04:00
commit 586bdf99e9
71 changed files with 5253 additions and 4614 deletions
Download patch file Download diff file Expand all files Collapse all files

5
python_apps/pypo/schedule/pypoliqqueue.py
View file

@ -74,8 +74,9 @@ class PypoLiqQueue(Thread):
schedule_deque.append(media_schedule[i])
if len(keys):
time_until_next_play = pure.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