Author: duncan
Date: Wed Mar 12 15:19:37 2008
New Revision: 10509
Log:
Added code to cope with None inprogress objects
Added getscheduledrecordingsco test method
Modified:
branches/rel-1/freevo/src/tv/record_client.py
Modified: branches/rel-1/freevo/src/tv/record_client.py
==============================================================================
--- branches/rel-1/freevo/src/tv/record_client.py (original)
+++ branches/rel-1/freevo/src/tv/record_client.py Wed Mar 12 15:19:37 2008
@@ -114,6 +114,9 @@
now = time.time()
print self.timeit(now)+': pingCo started'
inprogress = self.recordserver_rpc('ping')
+ if not inprogress:
+ print self.timeit(now)+': pingCo.inprogress=%r' % inprogress
+ return
print self.timeit(now)+': pingCo.inprogress=%r' % inprogress
yield inprogress
print self.timeit(now)+': pingCo.inprogress=%r' % inprogress
@@ -127,6 +130,9 @@
now = time.time()
print self.timeit(now)+': findNextProgramCo(isrecording=%r) started' %
(isrecording,)
inprogress = self.recordserver_rpc('findNextProgram', isrecording)
+ if not inprogress:
+ print self.timeit(now)+': findNextProgramCo.inprogress=%r' %
inprogress
+ return
print self.timeit(now)+': findNextProgramCo.inprogress=%r' % inprogress
yield inprogress
print self.timeit(now)+': findNextProgramCo.inprogress=%r' % inprogress
@@ -135,11 +141,30 @@
@kaa.coroutine()
+ def getScheduledRecordingsCo(self):
+ """ """
+ now = time.time()
+ print self.timeit(now)+': getScheduledRecordingsCo() started'
+ inprogress = self.recordserver_rpc('getScheduledRecordings')
+ if not inprogress:
+ print self.timeit(now)+': getScheduledRecordingsCo.inprogress=%r'
% inprogress
+ return
+ print self.timeit(now)+': getScheduledRecordingsCo.inprogress=%r' %
inprogress
+ yield inprogress
+ print self.timeit(now)+': getScheduledRecordingsCo.inprogress=%r' %
inprogress
+ yield inprogress.get_result()
+ print self.timeit(now)+': getScheduledRecordingsCo finished'
+
+
+ @kaa.coroutine()
def updateFavoritesScheduleCo(self):
""" """
now = time.time()
print self.timeit(now)+': updateFavoritesScheduleCo started'
inprogress = self.recordserver_rpc('updateFavoritesSchedule')
+ if not inprogress:
+ print self.timeit(now)+': updateFavoritesScheduleCo.inprogress=%r'
% inprogress
+ return
print self.timeit(now)+': updateFavoritesScheduleCo.inprogress=%r' %
inprogress
yield inprogress
print self.timeit(now)+': updateFavoritesScheduleCo.inprogress=%r' %
inprogress
@@ -153,6 +178,9 @@
now = time.time()
print self.timeit(now)+': getNextProgramStart begin'
inprogress = self.recordserver_rpc('updateFavoritesSchedule')
+ if not inprogress:
+ print self.timeit(now)+': getNextProgramStart.inprogress=%r' %
inprogress
+ return
print self.timeit(now)+': getNextProgramStart.inprogress=%r' %
inprogress
yield inprogress
print self.timeit(now)+': getNextProgramStart.inprogress=%r' %
inprogress
@@ -161,6 +189,9 @@
yield inprogress.get_result()
print self.timeit(now)+': getNextProgramStart.findNextProgram'
inprogress = self.recordserver_rpc('findNextProgram')
+ if not inprogress:
+ print self.timeit(now)+': getNextProgramStart.inprogress=%r' %
inprogress
+ return
print self.timeit(now)+': getNextProgramStart.inprogress=%r' %
inprogress
yield inprogress
print self.timeit(now)+': getNextProgramStart.inprogress=%r' %
inprogress
@@ -557,7 +588,7 @@
if function == "pingco":
result = rc.pingCo().wait()
- print 'pingCo=%r"' % (result,)
+ print 'pingCo=%r' % (result,)
raise SystemExit
if function == "findnextprogramco":
@@ -565,6 +596,11 @@
print 'findNextProgramCo=%r\n"%s"' % (result, result)
raise SystemExit
+ if function == "getscheduledrecordingsco":
+ result = rc.getScheduledRecordingsCo().wait()
+ print 'getScheduledRecordingsCo=%r' % (result,)
+ raise SystemExit
+
if function == "updatefavoritesscheduleco":
result = rc.updateFavoritesScheduleCo().wait()
print 'updateFavoritesScheduleCo=%r' % (result,)
@@ -603,11 +639,13 @@
elif function == "getscheduledrecordingsnow":
result = rc.getScheduledRecordingsNow()
- status, schedule = result
- if status:
- print 'result: %r\n"%s"' % (schedule.__dict__, result)
- else:
- print 'result: %r' % (result,)
+ print 'result=%r\n"%s"' % (result, result)
+ if config.DEBUG > 2:
+ status, schedule = result
+ if status:
+ print 'result: %r\n"%s"' % (schedule.__dict__, result)
+ else:
+ print 'result: %r' % (result,)
raise SystemExit
elif function == "getscheduledrecordings":
@@ -700,6 +738,7 @@
else:
print '%r not found' % (function)
+ raise SystemExit
kaa.notifier.OneShotTimer(shutdown, 'bye', time.time()).start(20)
kaa.main.run()
-------------------------------------------------------------------------
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
