Author: duncan
Date: Tue Mar  4 17:05:39 2008
New Revision: 10466

Log:
Updated for new tv scheduling


Modified:
   branches/rel-1/freevo/src/util/misc.py

Modified: branches/rel-1/freevo/src/util/misc.py
==============================================================================
--- branches/rel-1/freevo/src/util/misc.py      (original)
+++ branches/rel-1/freevo/src/util/misc.py      Tue Mar  4 17:05:39 2008
@@ -395,7 +395,6 @@
 
 def comingup(items=None, scheduledRecordings=None):
     """ Coming Up for TV schedule """
-    print 'comingup(items=%r, scheduledRecordings=%r)' % (items, 
scheduledRecordings)
     from tv.record_client import RecordClient
     import time
     import codecs
@@ -411,17 +410,17 @@
             cache.close()
             return result
 
-        (status, recordings) = (True, 
RecordClient().getScheduledRecordingsNow())
-        if recordings is None:
-            return _('Recording server is not available')
+        (status, schedule) = RecordClient().getScheduledRecordingsNow()
+        if not status:
+            return schedule
     else:
-        (status, recordings) = scheduledRecordings
+        (status, schedule) = scheduledRecordings
 
     if not status:
         result = _('Recording server is not available')
         return result
 
-    progs = recordings.getProgramList()
+    progs = schedule.getProgramList()
 
     f = lambda a, b: cmp(a.start, b.start)
     progl = progs.values()

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to