Author: rshortt
Date: Mon Mar 13 17:26:31 2006
New Revision: 8081
Modified:
trunk/WIP/RobShortt/webserver-epg2/src/base.py
trunk/WIP/RobShortt/webserver-epg2/src/pages/guide.py
trunk/WIP/RobShortt/webserver-epg2/src/pages/recordings.py
trunk/WIP/RobShortt/webserver-epg2/src/pages/search.py
Log:
Change short_name to name.
Modified: trunk/WIP/RobShortt/webserver-epg2/src/base.py
==============================================================================
--- trunk/WIP/RobShortt/webserver-epg2/src/base.py (original)
+++ trunk/WIP/RobShortt/webserver-epg2/src/base.py Mon Mar 13 17:26:31 2006
@@ -191,18 +191,18 @@
"""
channels = guide().get_channels()
- channels.sort(lambda a, b: cmp(a.short_name, b.short_name))
+ channels.sort(lambda a, b: cmp(a.name, b.name))
channels.sort(lambda a, b: cmp(int(a.tuner_id), int(b.tuner_id)))
for ch in channels:
- self.res += '<option value="%s" ' % ch.short_name
- if ch.short_name == Unicode(chan):
+ self.res += '<option value="%s" ' % ch.name
+ if ch.name == Unicode(chan):
self.res += 'selected '
if ch.tuner_id:
- self.res += '>%s %s</option>\n' % (ch.tuner_id, ch.short_name)
+ self.res += '>%s %s</option>\n' % (ch.tuner_id, ch.name)
else:
- self.res += '>%s</option>\n' % ch.short_name
+ self.res += '>%s</option>\n' % ch.name
self.res += """
</select>
Modified: trunk/WIP/RobShortt/webserver-epg2/src/pages/guide.py
==============================================================================
--- trunk/WIP/RobShortt/webserver-epg2/src/pages/guide.py (original)
+++ trunk/WIP/RobShortt/webserver-epg2/src/pages/guide.py Mon Mar 13
17:26:31 2006
@@ -219,7 +219,7 @@
# 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.short_name, b.short_name))
+ channels.sort(lambda a, b: cmp(a.name, b.name))
channels.sort(lambda a, b: cmp_chan(a, b))
for chan in channels:
@@ -255,13 +255,13 @@
# TODO: use channel displayformat from config
if chan.tuner_id:
rowdata.append(u'<td class="channel">%s %s</td>' % \
- (chan.tuner_id[0], chan.short_name))
+ (chan.tuner_id[0], chan.name))
else:
- rowdata.append(u'<td class="channel">%s</td>' %
chan.short_name)
+ rowdata.append(u'<td class="channel">%s</td>' % chan.name)
c_left = n_cols * cpb
- progs = guide().search(channel =
guide().get_channel(chan.short_name),
+ progs = guide().search(channel = guide().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') +
' »' )
@@ -305,7 +305,7 @@
# insert right arrows
cell += u' »'
colspan = c_left
- popid = u'%s:%s' % (chan.short_name, prog.start)
+ popid = u'%s:%s' % (chan.name, prog.start)
style = u''
if colspan == n_cols * cpb:
Modified: trunk/WIP/RobShortt/webserver-epg2/src/pages/recordings.py
==============================================================================
--- trunk/WIP/RobShortt/webserver-epg2/src/pages/recordings.py (original)
+++ trunk/WIP/RobShortt/webserver-epg2/src/pages/recordings.py Mon Mar 13
17:26:31 2006
@@ -78,7 +78,7 @@
prog = None
for p in progs:
if Unicode(chan) == \
- guide().get_channel(p.channel).short_name \
+ guide().get_channel(p.channel).name \
and int(start) == p.start:
prog = p
Modified: trunk/WIP/RobShortt/webserver-epg2/src/pages/search.py
==============================================================================
--- trunk/WIP/RobShortt/webserver-epg2/src/pages/search.py (original)
+++ trunk/WIP/RobShortt/webserver-epg2/src/pages/search.py Mon Mar 13
17:26:31 2006
@@ -96,7 +96,7 @@
status = 'basic'
for rp in rec_progs:
- if p.channel.short_name == rp.channel and rp.start ==
p.start:
+ if p.channel.name == rp.channel and rp.start == p.start:
if rp.status == u'recording':
status = 'recording'
elif rp.status == u'conflict':
@@ -121,7 +121,7 @@
time.localtime(p.stop)),
'class="'+status+'" colspan="1"')
- self.tableCell(Unicode(p.channel.short_name),
'class="'+status+'" colspan="1"')
+ self.tableCell(Unicode(p.channel.name), 'class="'+status+'"
colspan="1"')
self.tableCell(Unicode(p.title), 'class="'+status+'"
colspan="1"')
# self.tableCell(Unicode(p.subtitle), 'class="'+status+'"
colspan="1"')
@@ -136,17 +136,17 @@
if status == 'scheduled':
cell = ('<a
href="recordings?chan=%s&start=%s&action=remove">'+
- _('Remove')+'</a>') % (p.channel.short_name,
p.start)
+ _('Remove')+'</a>') % (p.channel.name, p.start)
elif status == 'recording':
cell = ('<a
href="recordings?chan=%s&start=%s&action=remove">'+
- _('Record')+'</a>') % (p.channel.short_name,
p.start)
+ _('Record')+'</a>') % (p.channel.name, p.start)
else:
cell = ('<a
href="recordings?chan=%s&start=%s&action=add">'+
- _('Record')+'</a>') % (p.channel.short_name,
p.start)
+ _('Record')+'</a>') % (p.channel.name, p.start)
cell += \
(' | <a
href="edit_favorite?chan=%s&start=%s&action=add">'+
- _('New favorite')+'</a>') % (p.channel.short_name,
p.start)
+ _('New favorite')+'</a>') % (p.channel.name, p.start)
self.tableCell(cell, 'class="'+status+'" colspan="1"')
-------------------------------------------------------
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
