Author: rshortt
Date: Mon Mar 13 17:29:11 2006
New Revision: 8082
Modified:
trunk/WIP/RobShortt/tvserver-epg2/src/epg.py
trunk/WIP/RobShortt/tvserver-epg2/src/recorder.py
trunk/WIP/RobShortt/tvserver-epg2/src/server.py
Log:
Change short_name to name.
Modified: trunk/WIP/RobShortt/tvserver-epg2/src/epg.py
==============================================================================
--- trunk/WIP/RobShortt/tvserver-epg2/src/epg.py (original)
+++ trunk/WIP/RobShortt/tvserver-epg2/src/epg.py Mon Mar 13 17:29:11 2006
@@ -172,7 +172,7 @@
# Now search the db
# NOTE: do we need something like "exact_match=not fav.substring" here?
for p in guide().search(keywords=fav.name):
- if not fav.match(p.title, p.channel.short_name, p.start):
+ if not fav.match(p.title, p.channel.name, p.start):
continue
rec = Recording(p.title, p.channel.id, fav.priority,
Modified: trunk/WIP/RobShortt/tvserver-epg2/src/recorder.py
==============================================================================
--- trunk/WIP/RobShortt/tvserver-epg2/src/recorder.py (original)
+++ trunk/WIP/RobShortt/tvserver-epg2/src/recorder.py Mon Mar 13 17:29:11 2006
@@ -247,7 +247,7 @@
return String(name.replace('.', '').replace(' ', '')).upper().strip()
def add_channel(self, chan_obj, chan_id):
- if chan_obj.short_name in self.known_channels:
+ if chan_obj.name in self.known_channels:
# duplicate, skip it
return
@@ -256,8 +256,8 @@
del(self.unknown_channels[chan_id])
chan_obj.tuner_id = chan_id
- self.known_channels[chan_obj.short_name] = chan_obj
- self.possible_bouquets[-1].append(chan_obj.short_name)
+ self.known_channels[chan_obj.name] = chan_obj
+ self.possible_bouquets[-1].append(chan_obj.name)
def describe_cb(self, result):
"""
@@ -291,7 +291,7 @@
chan = guide().get_channel_by_tuner_id(channel)
if not chan:
- # step 3, try short_name
+ # step 3, try name
chan = guide().get_channel(channel)
if chan:
Modified: trunk/WIP/RobShortt/tvserver-epg2/src/server.py
==============================================================================
--- trunk/WIP/RobShortt/tvserver-epg2/src/server.py (original)
+++ trunk/WIP/RobShortt/tvserver-epg2/src/server.py Mon Mar 13 17:29:11 2006
@@ -434,7 +434,7 @@
parameter: channel
"""
for c in self.epg.channels():
- if c.short_name == channel:
+ if c.name == channel:
channel = c
break
else:
-------------------------------------------------------
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
