Update of /cvsroot/freevo/kaa/epg/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32719
Modified Files:
channel.py
Log Message:
use new sqlite interface
Index: channel.py
===================================================================
RCS file: /cvsroot/freevo/kaa/epg/src/channel.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** channel.py 21 Aug 2005 11:26:50 -0000 1.6
--- channel.py 21 Aug 2005 13:58:23 -0000 1.7
***************
*** 58,61 ****
--- 58,62 ----
# kaa.epg imports
from program import Program
+ from schema import *
# get logging object
***************
*** 115,119 ****
notifier_counter = 0
for p in self.__epg.sql_get_programs(self.id, start, stop):
! i = Program(p[0], p[4], p[2], p[3], p[5], p[6], p[7],
channel=self)
new_progs.append(i)
notifier_counter = (notifier_counter + 1) % 500
--- 116,121 ----
notifier_counter = 0
for p in self.__epg.sql_get_programs(self.id, start, stop):
! i = Program(p[ID], p[TITLE], p[START], p[STOP], p[EPISODE],
! p[SUBTITLE], p[DESCRIPTION], channel=self)
new_progs.append(i)
notifier_counter = (notifier_counter + 1) % 500
***************
*** 133,142 ****
before = self.__epg.sql_get_programs(self.id, 0, start)
if before:
! d_start = before[-1].stop
else:
d_start = START_TIME
after = self.__epg.sql_get_programs(self.id, stop, -1)
if after:
! d_stop = after[0].start
else:
d_stop = STOP_TIME
--- 135,144 ----
before = self.__epg.sql_get_programs(self.id, 0, start)
if before:
! d_start = before[-1][STOP]
else:
d_start = START_TIME
after = self.__epg.sql_get_programs(self.id, stop, -1)
if after:
! d_stop = after[0][START]
else:
d_stop = STOP_TIME
***************
*** 156,160 ****
more = self.__epg.sql_get_programs(self.id, 10, start)
if more:
! d = self.__get_dummy_program(more[-1].stop, p.start)
else:
d = self.__get_dummy_program(START_TIME, p.start)
--- 158,162 ----
more = self.__epg.sql_get_programs(self.id, 10, start)
if more:
! d = self.__get_dummy_program(more[-1][STOP], p.start)
else:
d = self.__get_dummy_program(START_TIME, p.start)
***************
*** 165,169 ****
more = self.__epg.sql_get_programs(self.id, stop, -1)
if more:
! d = self.__get_dummy_program(p.stop, more[0].start)
else:
d = self.__get_dummy_program(p.stop, STOP_TIME)
--- 167,171 ----
more = self.__epg.sql_get_programs(self.id, stop, -1)
if more:
! d = self.__get_dummy_program(p.stop, more[0][START])
else:
d = self.__get_dummy_program(p.stop, STOP_TIME)
***************
*** 239,242 ****
--- 241,245 ----
# only get what's running at time start
return filter(lambda x: x.start <= start, self.programs)[-1]
+
elif stop == None:
# get everything from time start onwards
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
