Update of /cvsroot/freevo/freevo/src/www/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2990/src/www/plugins
Modified Files:
guide.py recordings.py search.py
Log Message:
use kaa.epg instead of pyepg
Index: search.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/plugins/search.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** search.py 28 May 2005 18:37:43 -0000 1.3
--- search.py 26 Jun 2005 10:53:16 -0000 1.4
***************
*** 41,45 ****
from www.base import HTMLResource, FreevoResource
! import pyepg
# get logging object
--- 41,45 ----
from www.base import HTMLResource, FreevoResource
! import kaa.epg
# get logging object
***************
*** 61,65 ****
programs = []
else:
! programs = pyepg.search(Unicode(searchstr),
by_chan,
form.get('search_title'),
--- 61,65 ----
programs = []
else:
! programs = kaa.epg.search(Unicode(searchstr),
by_chan,
form.get('search_title'),
Index: recordings.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/plugins/recordings.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** recordings.py 28 May 2005 16:46:23 -0000 1.3
--- recordings.py 26 Jun 2005 10:53:16 -0000 1.4
***************
*** 37,41 ****
# epg support
! import pyepg
# freevo imports
--- 37,41 ----
# epg support
! import kaa.epg
# freevo imports
***************
*** 80,84 ****
prog = None
for p in progs:
! if Unicode(chan) == pyepg.get_channel_by_id(p.channel).title \
and int(start) == p.start:
prog = p
--- 80,85 ----
prog = None
for p in progs:
! if Unicode(chan) == \
! kaa.epg.get_channel_by_id(p.channel).title \
and int(start) == p.start:
prog = p
***************
*** 91,95 ****
elif action == 'add':
try:
! prog = pyepg.get_channel(chan)[int(start)]
except:
fv.printHeader('Scheduled Recordings', 'styles/main.css')
--- 92,96 ----
elif action == 'add':
try:
! prog = kaa.epg.get_channel(chan)[int(start)]
except:
fv.printHeader('Scheduled Recordings', 'styles/main.css')
***************
*** 143,147 ****
colspan = 'class="' + status + '" colspan="1"'
! channel = pyepg.get_channel_by_id(prog.channel).title
fv.tableRowOpen('class="chanrow"')
--- 144,148 ----
colspan = 'class="' + status + '" colspan="1"'
! channel = kaa.epg.get_channel_by_id(prog.channel).title
fv.tableRowOpen('class="chanrow"')
Index: guide.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/plugins/guide.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** guide.py 13 Feb 2005 18:42:09 -0000 1.1
--- guide.py 26 Jun 2005 10:53:16 -0000 1.2
***************
*** 12,15 ****
--- 12,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.2 2005/06/26 10:53:16 dischi
+ # use kaa.epg instead of pyepg
+ #
# Revision 1.1 2005/02/13 18:42:09 dischi
# move pages into plugins and pages subdir
***************
*** 21,27 ****
# More fixes: variable guide start time, category box, recordserver message.
# TODO:
! # -find out from pyepg when our last program is scheduled to let us better
# determine how far forward to let users skip
! # -find out from pyepg which program categories it has (ie: news, sports)
#
# Revision 1.3 2005/01/13 20:19:33 rshortt
--- 24,30 ----
# More fixes: variable guide start time, category box, recordserver message.
# TODO:
! # -find out from kaa.epg when our last program is scheduled to let us better
# determine how far forward to let users skip
! # -find out from kaa.epg which program categories it has (ie: news, sports)
#
# Revision 1.3 2005/01/13 20:19:33 rshortt
***************
*** 132,136 ****
import record.client
! import pyepg
# get logging object
--- 135,139 ----
import record.client
! import kaa.epg
# get logging object
***************
*** 141,145 ****
def makecategorybox(self):
! # TODO: get the categories from pyepg (from the DB)
allcategories = ['Sports', 'News']
allcategories.sort()
--- 144,148 ----
def makecategorybox(self):
! # TODO: get the categories from kaa.epg (from the DB)
allcategories = ['Sports', 'News']
allcategories.sort()
***************
*** 255,259 ****
showheader = 0
# for chan in get_channels().get_all():
! for chan in pyepg.channels:
#chan = chan.epg
#put guidehead every X rows
--- 258,262 ----
showheader = 0
# for chan in get_channels().get_all():
! for chan in kaa.epg.channels:
#chan = chan.epg
#put guidehead every X rows
-------------------------------------------------------
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
