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

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

Browse source
This commit is contained in:
Naomi Aro 2012-04-16 18:16:33 +02:00
commit b5f48c7732
2 changed files with 5 additions and 5 deletions
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 <?php
require_once 'Log.php';
class Application_Model_Scheduler { class Application_Model_Scheduler {
private $con; 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 Get highest priority media_item in the queue. Currently the highest
priority is decided by how close the start time is to "now". 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 return None
sorted_keys = sorted(schedule.keys()) sorted_keys = sorted(schedule.keys())
@ -121,8 +121,10 @@ class PypoFile(Thread):
except Empty, e: except Empty, e:
pass pass
media_item = self.get_highest_priority_media_item(self.media) 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: except Exception, e:
import traceback import traceback
top = traceback.format_exc() top = traceback.format_exc()