Author: dmeyer
Date: Mon Apr 16 19:21:08 2007
New Revision: 2631
Modified:
trunk/epg/AUTHORS
trunk/epg/src/channel.py
trunk/epg/src/client.py
trunk/epg/src/program.py
Log:
Remove unneeded stuff from Channel class and make it possible
to search from now to the end of time (stop=0)
Modified: trunk/epg/AUTHORS
==============================================================================
--- trunk/epg/AUTHORS (original)
+++ trunk/epg/AUTHORS Mon Apr 16 19:21:08 2007
@@ -10,4 +10,4 @@
Contributions:
Tanja Kotthaus <[EMAIL PROTECTED]>
-epgdata.com parser, SAX based XMLTV parser
+Initial epgdata.com parser, SAX based XMLTV parser
Modified: trunk/epg/src/channel.py
==============================================================================
--- trunk/epg/src/channel.py (original)
+++ trunk/epg/src/channel.py Mon Apr 16 19:21:08 2007
@@ -5,7 +5,7 @@
# $Id$
# -----------------------------------------------------------------------------
# kaa.epg - EPG Database
-# Copyright (C) 2004-2006 Jason Tackaberry, Dirk Meyer, Rob Shortt
+# Copyright (C) 2004-2007 Jason Tackaberry, Dirk Meyer, Rob Shortt
#
# First Edition: Jason Tackaberry <[EMAIL PROTECTED]>
#
@@ -29,26 +29,15 @@
__all__ = [ 'Channel' ]
-# python imports
-import time
-
-# kaa imports
-from kaa.weakref import weakref
-
class Channel(object):
"""
- kaa.epg channel class.
+ kaa.epg.Channel class.
"""
- def __init__(self, tuner_id, name, long_name, epg):
+ def __init__(self, tuner_id, name, long_name):
self.db_id = None
self.tuner_id = tuner_id
self.name = name
self.long_name = long_name
- self._epg = weakref(epg)
-
- # kludge - remove
- self.id = name
-
def __repr__(self):
return '<kaa.epg.Channel %s>' % self.name
Modified: trunk/epg/src/client.py
==============================================================================
--- trunk/epg/src/client.py (original)
+++ trunk/epg/src/client.py Mon Apr 16 19:21:08 2007
@@ -123,7 +123,7 @@
for row in epgdata:
db_id, tuner_id, name, long_name = row
- chan = Channel(tuner_id, name, long_name, self)
+ chan = Channel(tuner_id, name, long_name)
chan.db_id = db_id
self._channels_by_name[name] = chan
self._channels_by_db_id[db_id] = chan
@@ -177,9 +177,12 @@
start, stop = time
max = self._max_program_length
- kwargs["start"] = kaa.db.QExpr("range", (int(start) - max,
int(stop)))
- kwargs["stop"] = kaa.db.QExpr(">=", int(start))
-
+ if stop > 0:
+ kwargs["start"] = kaa.db.QExpr("range", (int(start) - max,
int(stop)))
+ kwargs["stop"] = kaa.db.QExpr(">=", int(start))
+ else:
+ kwargs["start"] = kaa.db.QExpr(">=", (int(start) - max))
+
query_data = self.server.rpc('guide.query', type='program', **kwargs)
# wait for the rpc to finish
yield query_data
@@ -231,7 +234,7 @@
elif tuner_id:
long_name = tuner_id[0]
- return Channel(tuner_id, name, long_name, epg=None)
+ return Channel(tuner_id, name, long_name)
@yield_execution_while_connecting()
Modified: trunk/epg/src/program.py
==============================================================================
--- trunk/epg/src/program.py (original)
+++ trunk/epg/src/program.py Mon Apr 16 19:21:08 2007
@@ -31,12 +31,11 @@
class Program(object):
"""
- kaa.epg program class.
+ kaa.epg.Program class.
"""
def __init__(self, channel, dbdata):
self.channel = channel
self._dbdata = dbdata
-
self.start = dbdata.get('start', 0)
self.stop = dbdata.get('stop', 0)
self.title = dbdata.get('title', u'')
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
