Author: dmeyer
Date: Tue Jan 22 14:52:39 2008
New Revision: 10305
Log:
adjust to yield_execution changes
Modified:
trunk/core/setup.py
trunk/core/src/ipc/tvserver.py
trunk/setup.py
trunk/tvserver/setup.py
trunk/tvserver/src/epg.py
trunk/tvserver/src/recorder.py
trunk/tvserver/src/server.py
Modified: trunk/core/setup.py
==============================================================================
--- trunk/core/setup.py (original)
+++ trunk/core/setup.py Tue Jan 22 14:52:39 2008
@@ -3,6 +3,11 @@
import sys
from distutils.core import setup, Extension
+# We require python 2.5 or later, so complain if that isn't satisfied.
+if sys.version.split()[0] < '2.5':
+ print "Python 2.5 or later required."
+ sys.exit(1)
+
share_files = ['share/mbus.conf']
def find_doc(result, dirname, files):
Modified: trunk/core/src/ipc/tvserver.py
==============================================================================
--- trunk/core/src/ipc/tvserver.py (original)
+++ trunk/core/src/ipc/tvserver.py Tue Jan 22 14:52:39 2008
@@ -142,9 +142,7 @@
self.server = entity
self.server.register('home-theatre.record.list.update')
self.rpc = self.server.rpc
- wait = self.rpc('home-theatre.recording.list')
- yield wait
- result = wait()
+ result = yield self.rpc('home-theatre.recording.list')
if not self.server:
return
@@ -197,9 +195,7 @@
if self._recordings[key].description:
continue
id = self._recordings[key].id
- wait = self.rpc('home-theatre.recording.describe', id)
- yield wait
- rec = wait()
+ rec = yield self.rpc('home-theatre.recording.describe', id)
if not rec:
log.error(rec)
return
@@ -265,10 +261,9 @@
if prog.subtitle:
info['subtitle'] = prog.subtitle
- result = self.rpc('home-theatre.recording.add', prog.title,
- prog.channel, 1000, prog.start, prog.stop, info)
- yield result
- if not result():
+ result = yield self.rpc('home-theatre.recording.add', prog.title,
+ prog.channel, 1000, prog.start, prog.stop,
info)
+ if not result:
# FIXME: get real error message from tvserver
yield 'failed'
yield self.SUCCESS
@@ -278,9 +273,8 @@
def remove(self, id):
if not self.server:
yield _('tvserver unavailable')
- result = self.rpc('home-theatre.recording.remove', id)
- yield result
- if not result():
+ result = yield self.rpc('home-theatre.recording.remove', id)
+ if not result:
# FIXME: get real error message from tvserver
yield 'failed'
yield self.SUCCESS
@@ -334,9 +328,7 @@
self.server = entity
self.server.register('home-theatre.favorite.list.update')
self.rpc = self.server.rpc
- wait = self.rpc('home-theatre.favorite.list')
- yield wait
- result = wait()
+ result = yield self.rpc('home-theatre.favorite.list')
if not self.server:
return
if not result:
@@ -377,10 +369,7 @@
yield _('tvserver unavailable')
if channels == 'ANY':
- channels = kaa.epg.get_channels()
- if isinstance(channels, kaa.InProgress):
- yield channels
- channels = channels()
+ channels = yield kaa.epg.get_channels()
channels = [ c.name for c in channels ]
if days == 'ANY':
@@ -389,10 +378,9 @@
if times == 'ANY':
times = [ '00:00-23:59' ]
- result = self.rpc('home-theatre.favorite.add', title, channels,
- priority, days, times, once)
- yield result
- if not result():
+ result = yield self.rpc('home-theatre.favorite.add', title, channels,
+ priority, days, times, once)
+ if not result:
# FIXME: get real error message from tvserver
yield 'failed'
yield self.SUCCESS
@@ -406,9 +394,8 @@
"""
if not self.server:
yield _('tvserver unavailable')
- result = self.rpc('home-theatre.favorite.remove', id)
- yield result
- if not result():
+ result = yield self.rpc('home-theatre.favorite.remove', id)
+ if not result:
# FIXME: get real error message from tvserver
yield 'failed'
yield self.SUCCESS
@@ -423,9 +410,8 @@
"""
if not self.server:
yield _('tvserver unavailable')
- result = self.rpc('home-theatre.favorite.modify', id, info)
- yield result
- if not result():
+ result = yield self.rpc('home-theatre.favorite.modify', id, info)
+ if not result:
# FIXME: get real error message from tvserver
yield 'failed'
yield self.SUCCESS
@@ -493,9 +479,7 @@
def connect(self):
if not self.server:
return
- wait = self.server.rpc('home-theatre.epg.connect')
- yield wait
- result = wait()
+ result = yield self.server.rpc('home-theatre.epg.connect')
if not result:
log.error(result)
return
Modified: trunk/setup.py
==============================================================================
--- trunk/setup.py (original)
+++ trunk/setup.py Tue Jan 22 14:52:39 2008
@@ -32,6 +32,11 @@
import sys
import distutils.core
+# We require python 2.5 or later, so complain if that isn't satisfied.
+if sys.version.split()[0] < '2.5':
+ print "Python 2.5 or later required."
+ sys.exit(1)
+
PYNOTIFIER_VERSION = '0.4.0pre1'
PYMBUS_VERSION = '0.9.0pre4'
Modified: trunk/tvserver/setup.py
==============================================================================
--- trunk/tvserver/setup.py (original)
+++ trunk/tvserver/setup.py Tue Jan 22 14:52:39 2008
@@ -29,8 +29,14 @@
#
# -----------------------------------------------------------------------------
+import sys
from freevo.distribution import setup
+# We require python 2.5 or later, so complain if that isn't satisfied.
+if sys.version.split()[0] < '2.5':
+ print "Python 2.5 or later required."
+ sys.exit(1)
+
# now start the python magic
setup (name = 'freevo-tvserver',
module = 'tvserver',
Modified: trunk/tvserver/src/epg.py
==============================================================================
--- trunk/tvserver/src/epg.py (original)
+++ trunk/tvserver/src/epg.py Tue Jan 22 14:52:39 2008
@@ -112,9 +112,7 @@
continue
# Try to find the exact title again.
- wait = kaa.epg.search(title = rec.name, channel=channel, time =
interval)
- yield wait
- results = wait()
+ results = yield kaa.epg.search(title=rec.name, channel=channel,
time=interval)
for epginfo in results:
# check all results
@@ -157,12 +155,10 @@
if fav.substring:
# unable to do that right now
- wait = kaa.epg.search(keywords=fav.name)
+ listing = yield kaa.epg.search(keywords=fav.name)
else:
# 'like' search
- wait = kaa.epg.search(title=kaa.epg.QExpr('like', fav.name))
- yield wait
- listing = wait()
+ listing = yield kaa.epg.search(title=kaa.epg.QExpr('like',
fav.name))
now = time.time()
for p in listing:
@@ -205,13 +201,8 @@
self.updating = True
- # start update
- # FIXME: latest kaa.epg changes do not block the rpc
- # until the update is complete. That is a bug here!
- wait = kaa.epg.guide.update()
- yield wait
try:
- wait()
+ yield kaa.epg.guide.update()
except Exception, e:
log.exception(e)
Modified: trunk/tvserver/src/recorder.py
==============================================================================
--- trunk/tvserver/src/recorder.py (original)
+++ trunk/tvserver/src/recorder.py Tue Jan 22 14:52:39 2008
@@ -154,9 +154,7 @@
# no recorder
yield True
- wait = entity.rpc('home-theatre.device.list')
- yield wait
- result = wait()
+ result = yield entity.rpc('home-theatre.device.list')
if not result:
log.error(result)
return
@@ -254,9 +252,7 @@
def _describe(self):
"""
"""
- wait = self.entity.rpc('home-theatre.device.describe', self.device)
- yield wait
- result = wait()
+ result = yield self.entity.rpc('home-theatre.device.describe',
self.device)
if not result:
log.error(result)
self.handler.remove(self)
@@ -430,11 +426,9 @@
filename = self.get_url(rec)
rec.url = filename
log.info('%s: schedule %s', self.name, rec.name)
- wait = self.entity.rpc(
+ result = yield self.entity.rpc(
'home-theatre.vdr.record', self.device, channel,
remote.start,
rec.stop + rec.stop_padding, filename, ())
- yield wait
- result = wait()
if not result:
log.error(result)
self.handler.remove(self)
@@ -446,9 +440,7 @@
# remove the recording
log.info('%s: remove %s', self.name, remote.recording.name)
self.recordings.remove(remote)
- wait = self.entity.rpc('home-theatre.vdr.remove', remote.id)
- yield wait
- result = wait()
+ result = yield self.entity.rpc('home-theatre.vdr.remove',
remote.id)
if not result:
log.error(result)
self.handler.remove(self)
Modified: trunk/tvserver/src/server.py
==============================================================================
--- trunk/tvserver/src/server.py (original)
+++ trunk/tvserver/src/server.py Tue Jan 22 14:52:39 2008
@@ -232,9 +232,7 @@
kaa.OneShotTimer(self.epg_update).start(0.1)
return
self.locked = True
- wait = self.epg.check(self.recordings, self.favorites)
- if isinstance(wait, kaa.InProgress):
- yield wait
+ yield self.epg.check(self.recordings, self.favorites)
self.locked = False
self.reschedule()
-------------------------------------------------------------------------
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
