Update of /cvsroot/freevo/freevo/src/record
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22844/src/record
Modified Files:
server.py
Log Message:
Get the channels list / epg from memory or disk cache.
Index: server.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/record/server.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** server.py 13 Aug 2004 12:29:14 -0000 1.4
--- server.py 14 Aug 2004 01:20:08 -0000 1.5
***************
*** 8,11 ****
--- 8,14 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2004/08/14 01:20:08 rshortt
+ # Get the channels list / epg from memory or disk cache.
+ #
# Revision 1.4 2004/08/13 12:29:14 rshortt
# This should keep updateFavoritesSchedule from stopping a running recording
***************
*** 75,78 ****
--- 78,82 ----
import util.popen3
from util.videothumb import snapshot
+ from tv.channels import get_channels
def _debug_(text):
***************
*** 171,176 ****
def scheduleRecording(self, prog=None):
- guide = tv_util.get_guide()
-
if not prog:
return (FALSE, 'no prog')
--- 175,178 ----
***************
*** 179,186 ****
return (FALSE, 'cannot record it if it is over')
! for chan in guide.chan_list:
if prog.channel_id == chan.id:
! _debug_('scheduleRecording: prog.channel_id="%s" chan.id="%s"
chan.tunerid="%s"' % (prog.channel_id, chan.id, chan.tunerid))
! prog.tunerid = chan.tunerid
scheduledRecordings = self.getScheduledRecordings()
--- 181,188 ----
return (FALSE, 'cannot record it if it is over')
! for chan in get_channels().get_all():
if prog.channel_id == chan.id:
! _debug_('scheduleRecording: prog.channel_id="%s" chan.id="%s"
chan.epg.tunerid="%s"' % (prog.channel_id, chan.id, chan.epg.tunerid))
! prog.tunerid = chan.epg.tunerid
scheduledRecordings = self.getScheduledRecordings()
***************
*** 243,248 ****
def findProg(self, chan=None, start=None):
- guide = tv_util.get_guide()
-
_debug_('findProg: %s, %s' % (chan, start))
--- 245,248 ----
***************
*** 250,257 ****
return (FALSE, 'no chan or no start')
! for ch in guide.chan_list:
if chan == ch.id:
_debug_('CHANNEL MATCH: %s' % ch.id)
! for prog in ch.programs:
if start == '%s' % prog.start:
_debug_('PROGRAM MATCH: %s' % prog.title)
--- 250,257 ----
return (FALSE, 'no chan or no start')
! for ch in get_channels().get_all():
if chan == ch.id:
_debug_('CHANNEL MATCH: %s' % ch.id)
! for prog in ch.epg.programs:
if start == '%s' % prog.start:
_debug_('PROGRAM MATCH: %s' % prog.title)
***************
*** 262,267 ****
def findMatches(self, find=None, movies_only=None):
- guide = tv_util.get_guide()
-
_debug_('findMatches: %s' % find)
--- 262,265 ----
***************
*** 277,282 ****
now = time.time()
! for ch in guide.chan_list:
! for prog in ch.programs:
if prog.stop < now:
continue
--- 275,280 ----
now = time.time()
! for ch in get_channels().get_all():
! for prog in ch.epg.programs:
if prog.stop < now:
continue
***************
*** 573,582 ****
def addFavoriteToSchedule(self, fav):
- guide = tv_util.get_guide()
favs = {}
favs[fav.name] = fav
! for ch in guide.chan_list:
! for prog in ch.programs:
(isFav, favorite) = self.isProgAFavorite(prog, favs)
if isFav:
--- 571,579 ----
def addFavoriteToSchedule(self, fav):
favs = {}
favs[fav.name] = fav
! for ch in get_channels().get_all():
! for prog in ch.epg.programs:
(isFav, favorite) = self.isProgAFavorite(prog, favs)
if isFav:
***************
*** 591,600 ****
# previously decided not to record it.
- guide = tv_util.get_guide()
-
# First get the timeframe of the guide.
last = 0
! for ch in guide.chan_list:
! for prog in ch.programs:
if prog.start > last: last = prog.start
--- 588,595 ----
# previously decided not to record it.
# First get the timeframe of the guide.
last = 0
! for ch in get_channels().get_all():
! for prog in ch.epg.programs:
if prog.start > last: last = prog.start
***************
*** 624,629 ****
self.removeScheduledRecording(prog)
! for ch in guide.chan_list:
! for prog in ch.programs:
(isFav, favorite) = self.isProgAFavorite(prog, favs)
if isFav:
--- 619,624 ----
self.removeScheduledRecording(prog)
! for ch in get_channels().get_all():
! for prog in ch.epg.programs:
(isFav, favorite) = self.isProgAFavorite(prog, favs)
if isFav:
-------------------------------------------------------
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
