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

Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

This commit is contained in:
denise 2013-05-30 15:06:09 -04:00
parent 527b1eaf1d bc22a8a871
commit 2e3e8659c1
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gen-snapshot.sh
View File

@ -6,7 +6,7 @@ VERSION=2.4.0~$(date "+%Y%m%d")
BUILDDEST=/tmp/airtime-${VERSION}/ BUILDDEST=/tmp/airtime-${VERSION}/
DEBDIR=`pwd`/debian DEBDIR=`pwd`/debian
git checkout master git checkout 2.4.x
git pull git pull
echo "cleaning up previous build..." echo "cleaning up previous build..."

8
python_apps/pypo/pypofetch.py
View File

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

6
python_apps/pypo/pypoliqqueue.py
View File

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

2
python_apps/pypo/pypopush.py
View File

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