Author: dmeyer
Date: Wed Mar 22 16:18:24 2006
New Revision: 8126
Modified:
trunk/webserver/bin/freevo-webserver
trunk/webserver/src/base.py
trunk/webserver/src/config.py
trunk/webserver/src/pages/guide.py
trunk/webserver/src/pages/proginfo.py
trunk/webserver/src/pages/recordings.py
trunk/webserver/src/pages/search.py
Log:
adjust to kaa.epg changes
Modified: trunk/webserver/bin/freevo-webserver
==============================================================================
--- trunk/webserver/bin/freevo-webserver (original)
+++ trunk/webserver/bin/freevo-webserver Wed Mar 22 16:18:24 2006
@@ -51,7 +51,6 @@
# kaa imports
import kaa.notifier
-import kaa.epg
# import freevo config
import freevo.conf
@@ -76,14 +75,6 @@
print 'No www users specified, use --add-user to add at least one'
usage()
-# load the epg
-epg_filename = freevo.webserver.config.epg.database
-if epg_filename.find('$(DATADIR)') >= 0:
- epg_filename = epg_filename.replace('$(DATADIR)', freevo.conf.DATADIR)
-
-kaa.epg.connect('sqlite2', epg_filename)
-kaa.epg.load()
-
# import ipc.tvserver to attach to the mbus
mbus = freevo.ipc.Instance('webserver')
mbus.connect('freevo.ipc.tvserver')
Modified: trunk/webserver/src/base.py
==============================================================================
--- trunk/webserver/src/base.py (original)
+++ trunk/webserver/src/base.py Wed Mar 22 16:18:24 2006
@@ -31,6 +31,7 @@
# -----------------------------------------------------------------------------
# kaa imports
+import kaa.epg
from kaa.strutils import get_encoding
# webserver imports
@@ -167,7 +168,6 @@
"""
def printAdvancedSearchForm(self, form=None):
- from freevo.ipc.epg import connect as guide, cmp_channel
chan = searchstr = ''
bychan = False
@@ -190,9 +190,7 @@
_('Search by channel:') + """ <select name="channel">
"""
- channels = guide().get_channels()
- channels.sort(lambda a, b: cmp(a.name, b.name))
- channels.sort(lambda a, b: cmp_channel(a, b))
+ channels = kaa.epg.get_channels(sort=True)
for ch in channels:
self.res += '<option value="%s" ' % ch.name
Modified: trunk/webserver/src/config.py
==============================================================================
--- trunk/webserver/src/config.py (original)
+++ trunk/webserver/src/config.py Wed Mar 22 16:18:24 2006
@@ -33,11 +33,6 @@
Var(name='cols', default=6,
desc=('')) ]),
- # epg group
- Group(name='epg', desc=_('epg settings'), schema=[
- Var(name='database', default='$(DATADIR)/epg.db',
- desc=_('Filename for the sqlite database file')) ]),
-
# users
Dict(name='users', type=unicode, schema=Var(type=unicode),
desc=_('user and password settings. Set users[name] = password'))
Modified: trunk/webserver/src/pages/guide.py
==============================================================================
--- trunk/webserver/src/pages/guide.py (original)
+++ trunk/webserver/src/pages/guide.py Wed Mar 22 16:18:24 2006
@@ -40,7 +40,6 @@
# freevo core imports
import freevo.ipc
-from freevo.ipc.epg import connect as guide, cmp_channel
# webserver includes
from freevo.webserver import *
@@ -169,13 +168,7 @@
( n_cols*cpb + 1 ) )
showheader = 0
- channels = guide().get_channels()
-
- # TODO: use config to determine sort order
- # for now sort by name first, then tuner_id because tuner_id
- # may be None.
- channels.sort(lambda a, b: cmp(a.name, b.name))
- channels.sort(lambda a, b: cmp_channel(a, b))
+ channels = kaa.epg.get_channels(sort=True)
for chan in channels:
#put guidehead every X rows
@@ -216,7 +209,7 @@
c_left = n_cols * cpb
- progs = guide().search(channel = guide().get_channel(chan.name),
+ progs = kaa.epg.search(channel = kaa.epg.get_channel(chan.name),
time = (mfrguidestart, mfrnextguide))
if not len(progs):
rowdata.append(u'<td class="programnodata"
colspan="%s">« ' % (n_cols*cpb) + _('This channel has no data loaded') +
' »' )
Modified: trunk/webserver/src/pages/proginfo.py
==============================================================================
--- trunk/webserver/src/pages/proginfo.py (original)
+++ trunk/webserver/src/pages/proginfo.py Wed Mar 22 16:18:24 2006
@@ -33,8 +33,8 @@
import time
import logging
-# freevo imports
-from freevo.ipc.epg import connect as guide
+# kaa import
+import kaa.epg
# webserver imports
from freevo.webserver import *
@@ -54,12 +54,12 @@
chanid = id[:id.find(":")]
starttime = int( id[id.find(":")+1:] )
- chan = guide().get_channel(chanid)
+ chan = kaa.epg.get_channel(chanid)
if not chan:
self.add(u'no such channel %s' % chanid)
return True
- prog = guide().search(channel = chan, time = starttime)[0]
+ prog = kaa.epg.search(channel = chan, time = starttime)[0]
log.debug('program: %s', prog.title)
if prog.description in [u'', None]:
Modified: trunk/webserver/src/pages/recordings.py
==============================================================================
--- trunk/webserver/src/pages/recordings.py (original)
+++ trunk/webserver/src/pages/recordings.py Wed Mar 22 16:18:24 2006
@@ -34,9 +34,11 @@
import traceback
import logging
+# kaa imports
+import kaa.epg
+
# freevo core imports
import freevo.ipc
-from freevo.ipc.epg import connect as guide
# webserver includes
from freevo.webserver import *
@@ -78,7 +80,7 @@
prog = None
for p in progs:
if Unicode(chan) == \
- guide().get_channel(p.channel).name \
+ kaa.epg.get_channel(p.channel).name \
and int(start) == p.start:
prog = p
@@ -89,7 +91,7 @@
elif action == 'add':
try:
- prog = guide().search(channel=guide().get_channel(chan),
+ prog = kaa.epg.search(channel=kaa.epg.get_channel(chan),
time=int(start))[0]
except:
self.printHeader('Scheduled Recordings', 'styles/main.css')
Modified: trunk/webserver/src/pages/search.py
==============================================================================
--- trunk/webserver/src/pages/search.py (original)
+++ trunk/webserver/src/pages/search.py Wed Mar 22 16:18:24 2006
@@ -33,9 +33,11 @@
import time
import logging
+# kaa import
+import kaa.epg
+
# freevo core imports
import freevo.ipc
-from freevo.ipc.epg import connect as guide
# webserver includes
from freevo.webserver import *
@@ -57,7 +59,7 @@
channel = form.get('channel')
if by_channel:
- channel = guide().get_channel(channel)
+ channel = kaa.epg.get_channel(channel)
else:
channel = None
@@ -68,11 +70,11 @@
programs = []
else:
if channel:
- programs = guide().search(channel = channel,
+ programs = kaa.epg.search(channel = channel,
keywords = searchstr,
limit = 100)
else:
- programs = guide().search(keywords = searchstr, limit = 100)
+ programs = kaa.epg.search(keywords = searchstr, limit = 100)
if len(programs) < 1:
if searchstr:
-------------------------------------------------------
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
