Update of /cvsroot/freevo/freevo/src/www/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23213/src/www/htdocs
Modified Files:
edit_favorite.rpy genre.rpy guide.rpy manualrecord.rpy
proginfo.rpy wap_rec.rpy
Log Message:
Use the chanlist/epg from cache.
Index: guide.rpy
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/guide.rpy,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** guide.rpy 10 Aug 2004 16:02:39 -0000 1.28
--- guide.rpy 14 Aug 2004 01:23:30 -0000 1.29
***************
*** 12,15 ****
--- 12,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.29 2004/08/14 01:23:30 rshortt
+ # Use the chanlist/epg from cache.
+ #
# Revision 1.28 2004/08/10 16:02:39 rshortt
# Remove comma from between tag attributes.
***************
*** 101,104 ****
--- 104,108 ----
import config
import tv.record_client as ri
+ import tv.channels
from twisted.web import static
***************
*** 113,117 ****
allcategories = []
for chan in chanlist:
! for prog in chan.programs:
if prog.categories:
allcategories.extend(prog.categories)
--- 117,121 ----
allcategories = []
for chan in chanlist:
! for prog in chan.epg.programs:
if prog.categories:
allcategories.extend(prog.categories)
***************
*** 198,202 ****
mfrprevguide = 0
! guide = tv_util.get_guide()
(got_schedule, schedule) = ri.getScheduledRecordings()
if got_schedule:
--- 202,206 ----
mfrprevguide = 0
! guide = tv.channels.get_channels()
(got_schedule, schedule) = ri.getScheduledRecordings()
if got_schedule:
***************
*** 216,220 ****
fv.tableRowOpen('class="chanrow"')
fv.tableCell('<form>'+_('Time')+': ' + self.maketimejumpboxday(now) +
self.maketimejumpboxoffset(now) + '<input type=submit value="'+_('View')+'"></form>',
'class="utilhead"')
! categorybox = self.makecategorybox(guide.chan_list)
if categorybox:
fv.tableCell('<form
action="genre.rpy">'+_('Show')+' '+_('Category')+': '+categorybox+'<input
type=submit value="'+_('Change')+'"></form>', 'class="utilhead"')
--- 220,224 ----
fv.tableRowOpen('class="chanrow"')
fv.tableCell('<form>'+_('Time')+': ' + self.maketimejumpboxday(now) +
self.maketimejumpboxoffset(now) + '<input type=submit value="'+_('View')+'"></form>',
'class="utilhead"')
! categorybox = self.makecategorybox(guide.get_all())
if categorybox:
fv.tableCell('<form
action="genre.rpy">'+_('Show')+' '+_('Category')+': '+categorybox+'<input
type=submit value="'+_('Change')+'"></form>', 'class="utilhead"')
***************
*** 225,229 ****
( n_cols*cpb + 1 ) )
showheader = 0
! for chan in guide.chan_list:
#put guidehead every X rows
if showheader % 15 == 0:
--- 229,234 ----
( n_cols*cpb + 1 ) )
showheader = 0
! for chan in guide.get_all():
! chan = chan.epg
#put guidehead every X rows
if showheader % 15 == 0:
Index: genre.rpy
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/genre.rpy,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** genre.rpy 10 Aug 2004 12:54:22 -0000 1.10
--- genre.rpy 14 Aug 2004 01:23:30 -0000 1.11
***************
*** 12,15 ****
--- 12,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.11 2004/08/14 01:23:30 rshortt
+ # Use the chanlist/epg from cache.
+ #
# Revision 1.10 2004/08/10 12:54:22 outlyer
# An impressive update to the guide code from Jason Tackaberry that
***************
*** 67,72 ****
import tv.record_client as ri
from www.web_types import HTMLResource, FreevoResource
- import tv.epg_xmltv
import util, config
TRUE = 1
--- 70,75 ----
import tv.record_client as ri
from www.web_types import HTMLResource, FreevoResource
import util, config
+ from tv.channels import get_channels
TRUE = 1
***************
*** 113,117 ****
category = fv.formValue(form, 'category')
- guide = tv.epg_xmltv.get_guide()
(got_schedule, schedule) = ri.getScheduledRecordings()
if got_schedule:
--- 116,119 ----
***************
*** 126,131 ****
allcategories = []
! for chan in guide.chan_list:
! for prog in chan.programs:
if prog.categories:
allcategories.extend(prog.categories)
--- 128,133 ----
allcategories = []
! for chan in get_channels().get_all():
! for prog in chan.epg.programs:
if prog.categories:
allcategories.extend(prog.categories)
***************
*** 168,173 ****
desc = ''
gotdata = 0
! for chan in guide.chan_list:
! for prog in chan.programs:
if prog.stop > mfrguidestart and prog.start < mfrnextguide:
status = 'program'
--- 170,175 ----
desc = ''
gotdata = 0
! for chan in get_channels().get_all():
! for prog in chan.epg.programs:
if prog.stop > mfrguidestart and prog.start < mfrnextguide:
status = 'program'
Index: proginfo.rpy
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/proginfo.rpy,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** proginfo.rpy 10 Aug 2004 14:49:15 -0000 1.2
--- proginfo.rpy 14 Aug 2004 01:23:30 -0000 1.3
***************
*** 32,39 ****
from twisted.web.woven import page
- import util.tv_util as tv_util
import util
import config
import tv.record_client as ri
from twisted.web import static
--- 32,39 ----
from twisted.web.woven import page
import util
import config
import tv.record_client as ri
+ from tv.channels import get_channels
from twisted.web import static
***************
*** 49,57 ****
starttime = int( id[id.find(":")+1:] )
! guide = tv_util.get_guide()
!
! chan = guide.chan_dict[chanid]
! for prog in chan.programs:
! if prog.start == starttime:
break
--- 49,57 ----
starttime = int( id[id.find(":")+1:] )
! for chan in get_channels().get_all():
! if chan.id == chanid:
! for prog in chan.epg.programs:
! if prog.start == starttime:
! break
break
Index: wap_rec.rpy
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/wap_rec.rpy,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wap_rec.rpy 19 Feb 2004 04:57:59 -0000 1.4
--- wap_rec.rpy 14 Aug 2004 01:23:30 -0000 1.5
***************
*** 12,15 ****
--- 12,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2004/08/14 01:23:30 rshortt
+ # Use the chanlist/epg from cache.
+ #
# Revision 1.4 2004/02/19 04:57:59 gsbarbieri
# Support Web Interface i18n.
***************
*** 113,118 ****
fv.res += ' </card>\n'
else:
- guide = tv.epg_xmltv.get_guide()
-
fv.res += ' <card id="card1" title="Freevo" ontimer="#card2">\n'
fv.res += ' <timer value="30"/>\n'
--- 116,119 ----
***************
*** 131,136 ****
fv.res += ' Stop Time: <input name="stop" title="Stop Time
(hh:mm)" format="NN:NN" size="4" value="%s" /><br/>\n' % time.strftime("%H:%M",
time.localtime(time.time() + 3600))
fv.res += ' Channel: <select name="channel">\n'
! for ch in guide.chan_list:
! fv.res += ' <option
value="'+ch.id+'">'+ch.displayname+"</option>\n"
fv.res += ' </select></p>\n'
fv.res += ' <do type="accept" label="Record">\n'
--- 132,137 ----
fv.res += ' Stop Time: <input name="stop" title="Stop Time
(hh:mm)" format="NN:NN" size="4" value="%s" /><br/>\n' % time.strftime("%H:%M",
time.localtime(time.time() + 3600))
fv.res += ' Channel: <select name="channel">\n'
! for ch in get_channels().get_all():
! fv.res += ' <option
value="'+ch.id+'">'+ch.name+"</option>\n"
fv.res += ' </select></p>\n'
fv.res += ' <do type="accept" label="Record">\n'
Index: manualrecord.rpy
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/manualrecord.rpy,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** manualrecord.rpy 23 Feb 2004 08:33:21 -0000 1.11
--- manualrecord.rpy 14 Aug 2004 01:23:30 -0000 1.12
***************
*** 33,37 ****
import sys, time
! import tv.epg_xmltv, tv.epg_types
import tv.record_client as ri
--- 33,38 ----
import sys, time
! from tv.channels import get_channels
! from pyepg.program import TvProgram
import tv.record_client as ri
***************
*** 110,114 ****
else:
# assign attributes to object
! prog = tv.epg_types.TvProgram()
prog.channel_id = chan
if title:
--- 111,115 ----
else:
# assign attributes to object
! prog = TvProgram()
prog.channel_id = chan
if title:
***************
*** 132,141 ****
if errormsg or not action:
- guide = tv.epg_xmltv.get_guide()
channelselect = '<select name="chan">'
! for ch in guide.chan_list:
! if not ch.displayname:
! ch.displayname="?"
! channelselect = channelselect + '<option
value="'+ch.id+'">'+ch.displayname+"\n"
channelselect = channelselect + "</select>\n"
--- 133,141 ----
if errormsg or not action:
channelselect = '<select name="chan">'
! for ch in get_channels().get_all():
! if not ch.name:
! ch.name="?"
! channelselect = channelselect + '<option
value="'+ch.id+'">'+ch.name+"\n"
channelselect = channelselect + "</select>\n"
Index: edit_favorite.rpy
===================================================================
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/edit_favorite.rpy,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** edit_favorite.rpy 10 Aug 2004 14:32:56 -0000 1.19
--- edit_favorite.rpy 14 Aug 2004 01:23:30 -0000 1.20
***************
*** 12,15 ****
--- 12,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.20 2004/08/14 01:23:30 rshortt
+ # Use the chanlist/epg from cache.
+ #
# Revision 1.19 2004/08/10 14:32:56 rshortt
# Make it "work", still some bugs.
***************
*** 120,125 ****
import sys, time, string
from tv.record_types import Favorite
- import util.tv_util as tv_util
import tv.record_client as ri
--- 123,128 ----
import sys, time, string
+ from tv.channels import get_channels
from tv.record_types import Favorite
import tv.record_client as ri
***************
*** 197,202 ****
- guide = tv_util.get_guide()
-
fv.printHeader(_('Edit Favorite'), 'styles/main.css')
fv.res += ' <br/>\n'
--- 200,203 ----
***************
*** 230,234 ****
i = 1
chan_index = 0
! for ch in guide.chan_list:
if ch.displayname == fav.channel:
chan_index = i
--- 231,236 ----
i = 1
chan_index = 0
! for ch in get_channels().get_all():
! ch = ch.epg
if ch.displayname == fav.channel:
chan_index = i
-------------------------------------------------------
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
