Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15444
Modified Files:
channels.py tvguide.py
Log Message:
better pyepg integration
Index: tvguide.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/tvguide.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** tvguide.py 9 Aug 2004 21:19:47 -0000 1.44
--- tvguide.py 10 Aug 2004 19:37:23 -0000 1.45
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.45 2004/08/10 19:37:23 dischi
+ # better pyepg integration
+ #
# Revision 1.44 2004/08/09 21:19:47 dischi
# make tv guide working again (but very buggy)
***************
*** 117,121 ****
self.current_time = time.time()
self.channel = channels.get()
! self.selected = self.channel.epg.get(self.current_time)
self.channel_list = channels
box.destroy()
--- 120,125 ----
self.current_time = time.time()
self.channel = channels.get()
! self.selected = self.channel.get(self.current_time)[0]
!
self.channel_list = channels
box.destroy()
***************
*** 226,230 ****
self.channel_list.up()
self.channel = self.channel_list.get()
! self.selected = self.channel.epg.get(self.current_time)
self.refresh()
--- 230,234 ----
self.channel_list.up()
self.channel = self.channel_list.get()
! self.selected = self.channel.get(self.current_time)[0]
self.refresh()
***************
*** 232,246 ****
self.channel_list.down()
self.channel = self.channel_list.get()
! self.selected = self.channel.epg.get(self.current_time)
self.refresh()
elif event == MENU_LEFT:
! pos = max(0, self.selected.index-1)
! self.selected = self.channel.epg.programs[pos]
self.refresh()
elif event == MENU_RIGHT:
! pos = min(len(self.channel.epg.programs)-1, self.selected.index+1)
! self.selected = self.channel.epg.programs[pos]
self.refresh()
--- 236,256 ----
self.channel_list.down()
self.channel = self.channel_list.get()
! self.selected = self.channel.get(self.current_time)[0]
self.refresh()
elif event == MENU_LEFT:
! self.selected = self.channel.prev(self.selected)
! if self.selected.start:
! self.current_time = self.selected.start + 1
! else:
! self.current_time -= 60 * 30
self.refresh()
elif event == MENU_RIGHT:
! self.selected = self.channel.next(self.selected)
! if self.selected.start:
! self.current_time = self.selected.start + 1
! else:
! self.current_time -= 60 * 30
self.refresh()
Index: channels.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/channels.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** channels.py 9 Aug 2004 21:19:47 -0000 1.21
--- channels.py 10 Aug 2004 19:37:22 -0000 1.22
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.22 2004/08/10 19:37:22 dischi
+ # better pyepg integration
+ #
# Revision 1.21 2004/08/09 21:19:47 dischi
# make tv guide working again (but very buggy)
***************
*** 83,87 ****
else:
self.__add_freq__(freq)
!
def __add_freq__(self, freq):
--- 86,98 ----
else:
self.__add_freq__(freq)
!
! # variables from the epg
! self.id = self.epg.id
!
! # functions from the epg
! self.next = self.epg.next
! self.prev = self.epg.prev
! self.get = self.epg.get
!
def __add_freq__(self, freq):
***************
*** 121,130 ****
pickle = os.path.join(config.FREEVO_CACHEDIR, 'epg')
! epg = util.read_pickle(pickle)
! if not epg:
! epg = pyepg.load(source)
! if not epg:
! raise Exception(_('TV Guide is corrupt!'))
! util.save_pickle(epg, pickle)
for c in config.TV_CHANNELS:
--- 132,136 ----
pickle = os.path.join(config.FREEVO_CACHEDIR, 'epg')
! epg = pyepg.load(source, pickle)
for c in config.TV_CHANNELS:
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
