Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Naomi Aro 2012-04-16 18:16:33 +02:00
parent b9d82a579f a6c0a1d2d9
commit b5f48c7732
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/models/Scheduler.php
View File

@ -1,7 +1,5 @@
<?php
require_once 'Log.php';
class Application_Model_Scheduler {
private $con;
@ -663,4 +661,4 @@ class Application_Model_Scheduler {
}
}
class OutDatedScheduleException extends Exception {}
class OutDatedScheduleException extends Exception {}

6
python_apps/pypo/pypofile.py
View File

@ -74,7 +74,7 @@ class PypoFile(Thread):
Get highest priority media_item in the queue. Currently the highest
priority is decided by how close the start time is to "now".
"""
if schedule is None:
if schedule is None or len(schedule) == 0:
return None
sorted_keys = sorted(schedule.keys())
@ -121,8 +121,10 @@ class PypoFile(Thread):
except Empty, e:
pass
media_item = self.get_highest_priority_media_item(self.media)
self.copy_file(media_item)
if media_item is not None:
self.copy_file(media_item)
except Exception, e:
import traceback
top = traceback.format_exc()