Author: rshortt
Date: Tue Mar 7 13:22:10 2006
New Revision: 8050
Modified:
trunk/WIP/RobShortt/webserver-epg2/src/pages/proginfo.py
Log:
The guide uses kaa.epg2 now, still a work in progress, record does not yet work.
Modified: trunk/WIP/RobShortt/webserver-epg2/src/pages/proginfo.py
==============================================================================
--- trunk/WIP/RobShortt/webserver-epg2/src/pages/proginfo.py (original)
+++ trunk/WIP/RobShortt/webserver-epg2/src/pages/proginfo.py Tue Mar 7
13:22:10 2006
@@ -31,13 +31,17 @@
# python imports
import time
+import logging
-# kaa imports
-import kaa.epg
+# freevo imports
+from freevo.ipc.epg import connect as guide
# webserver imports
from freevo.webserver import *
+log = logging.getLogger('www')
+log.setLevel(logging.DEBUG)
+
MAX_DESCRIPTION_CHAR = 1000
class Resource(HTMLResource):
@@ -45,28 +49,32 @@
def render(self):
form = self.request.query
id = form.get('id')
+ log.debug('id: %s', id)
+
chanid = id[:id.find(":")]
starttime = int( id[id.find(":")+1:] )
- chan = kaa.epg.guide.channel_dict.get(chanid)
+ chan = guide().get_channel(chanid)
if not chan:
self.add(u'no such channel %s' % chanid)
return True
- prog = chan[starttime]
+ prog = guide().search(channel = chan, time = starttime)[0]
+ log.debug('program: %s', prog.title)
- if prog.description == '':
+ if prog.desc == '' or prog.desc == None:
desc = (_('Sorry, the program description for ' \
'%s is unavailable.')) % ('<b>'+prog.title+'</b>')
else:
- desc = prog.description.replace("\n","<br />")
+ desc = prog.desc.replace("\n","<br />")
desc = desc.lstrip()
if MAX_DESCRIPTION_CHAR and len(desc) > MAX_DESCRIPTION_CHAR:
desc=desc[:desc[:MAX_DESCRIPTION_CHAR].rfind('.')] + '. [...]'
- if prog.subtitle:
- desc = '"%s"<br/>%s' % (prog.subtitle, desc)
+ # TODO: add subtitle to kaa.epg2
+ #if prog.subtitle:
+ # desc = '"%s"<br/>%s' % (prog.subtitle, desc)
self.add(
u"<script>\n" \
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
