Update of /cvsroot/freevo/freevo/src/record
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2990/src/record
Modified Files:
external.py server.py
Log Message:
use kaa.epg instead of pyepg
Index: external.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/record/external.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** external.py 25 Jun 2005 08:52:28 -0000 1.9
--- external.py 26 Jun 2005 10:52:59 -0000 1.10
***************
*** 47,51 ****
import time
! import pyepg
import mbus
import notifier
--- 47,51 ----
import time
! import kaa.epg
import mbus
import notifier
***************
*** 91,97 ****
self.recordings = []
self.check_timer = None
! # FIXME: use pyepg for this during runtime
self.channels = {}
! for channel in pyepg.channels:
self.channels[channel.id] = channel.access_id
self.suffix = '.mpg'
--- 91,97 ----
self.recordings = []
self.check_timer = None
! # FIXME: use kaa.epg for this during runtime
self.channels = {}
! for channel in kaa.epg.channels:
self.channels[channel.id] = channel.access_id
self.suffix = '.mpg'
***************
*** 135,139 ****
bouquet = []
for dvb_name in b:
! for channel in pyepg.channels:
if channel.access_id == dvb_name:
bouquet.append(channel.id)
--- 135,139 ----
bouquet = []
for dvb_name in b:
! for channel in kaa.epg.channels:
if channel.access_id == dvb_name:
bouquet.append(channel.id)
Index: server.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/record/server.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** server.py 1 Apr 2005 17:59:45 -0000 1.42
--- server.py 26 Jun 2005 10:52:59 -0000 1.43
***************
*** 40,45 ****
import notifier
! # pyepg
! import pyepg
# freevo imports
--- 40,45 ----
import notifier
! # kaa.epg
! import kaa.epg
# freevo imports
***************
*** 136,141 ****
rec = recordings[0]
# search epg for that recording
! results = pyepg.search(rec.name, rec.channel, search_subtitle=False,
! search_description=False, exact_match=True)
epginfo = None
for p in results:
--- 136,141 ----
rec = recordings[0]
# search epg for that recording
! results = kaa.epg.search(rec.name, rec.channel,
search_subtitle=False,
! search_description=False, exact_match=True)
epginfo = None
for p in results:
***************
*** 307,312 ****
update = []
for f in copy.copy(self.favorites):
! for p in pyepg.search(f.name, search_subtitle=False,
! search_description=False, exact_match=True):
if not f.match(p.title, p.channel.id, p.start):
continue
--- 307,313 ----
update = []
for f in copy.copy(self.favorites):
! for p in kaa.epg.search(f.name, search_subtitle=False,
! search_description=False,
! exact_match=True):
if not f.match(p.title, p.channel.id, p.start):
continue
***************
*** 512,516 ****
dbid, priority, info = \
self.parse_parameter(val, ( int, int, dict ))
! prog = pyepg.guide.get_program_by_id(dbid)
if not prog:
return RPCError('Unknown id')
--- 513,517 ----
dbid, priority, info = \
self.parse_parameter(val, ( int, int, dict ))
! prog = kaa.epg.guide.get_program_by_id(dbid)
if not prog:
return RPCError('Unknown id')
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
