Author: duncan
Date: Sat Mar 8 14:17:09 2008
New Revision: 10482
Log:
Fixes for changes to the return tuple of getScheduledRecordingsNow
Modified:
branches/rel-1/freevo/src/tv/programitem.py
branches/rel-1/freevo/src/www/htdocs/genre.rpy
branches/rel-1/freevo/src/www/htdocs/guide.rpy
branches/rel-1/freevo/src/www/htdocs/guidechannel.rpy
branches/rel-1/freevo/src/www/htdocs/index.rpy
branches/rel-1/freevo/src/www/htdocs/library.rpy
branches/rel-1/freevo/src/www/htdocs/record.rpy
branches/rel-1/freevo/src/www/htdocs/search.rpy
Modified: branches/rel-1/freevo/src/tv/programitem.py
==============================================================================
--- branches/rel-1/freevo/src/tv/programitem.py (original)
+++ branches/rel-1/freevo/src/tv/programitem.py Sat Mar 8 14:17:09 2008
@@ -106,12 +106,13 @@
# 'Schedule for recording' OR 'Remove from schedule'
(status, schedule) = self.recordclient.getScheduledRecordingsNow()
- (status, reason) = self.recordclient.isProgScheduledNow(self.prog,
schedule.getProgramList())
- self.scheduled = status
- if self.scheduled:
- items.append((self.remove_program, _('Remove from schedule')))
- else:
- items.append((self.schedule_program, _('Schedule for
recording')))
+ if status:
+ (status, reason) =
self.recordclient.isProgScheduledNow(self.prog, schedule.getProgramList())
+ self.scheduled = status
+ if self.scheduled:
+ items.append((self.remove_program, _('Remove from
schedule')))
+ else:
+ items.append((self.schedule_program, _('Schedule for
recording')))
# 'Add to favorites' OR 'Remove from favorites'
(status, reason) = self.recordclient.isProgAFavoriteNow(self.prog)
Modified: branches/rel-1/freevo/src/www/htdocs/genre.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/genre.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/genre.rpy Sat Mar 8 14:17:09 2008
@@ -85,8 +85,8 @@
guide = tv.epg_xmltv.get_guide()
(status, schedule) = self.recordclient.getScheduledRecordingsNow()
- if schedule is not None:
- schedule = schedule.getProgramList()
+ if status:
+ program_list = schedule.getProgramList()
fv.printHeader(_('TV Genre for %s') % time.strftime('%a %b %d',
time.localtime(mfrguidestart)), \
config.WWW_STYLESHEET, config.WWW_JAVASCRIPT)
Modified: branches/rel-1/freevo/src/www/htdocs/guide.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/guide.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/guide.rpy Sat Mar 8 14:17:09 2008
@@ -142,8 +142,8 @@
guide = tv.epg_xmltv.get_guide()
(status, schedule) = self.recordclient.getScheduledRecordingsNow()
- if schedule:
- schedule = schedule.getProgramList()
+ if status:
+ program_list = schedule.getProgramList()
fv.printHeader(_('TV Guide'), config.WWW_STYLESHEET,
config.WWW_JAVASCRIPT, selected=_('TV Guide'))
fv.res += '<div id="content">\n';
@@ -204,13 +204,11 @@
_('This channel has no data loaded') + ' »')
for prog in chan.programs:
- if prog.stop > mfrguidestart and \
- prog.start < mfrnextguide and \
- c_left > 0:
+ if prog.stop > mfrguidestart and prog.start < mfrnextguide and
c_left > 0:
status = 'program'
- if schedule:
+ if status:
(result, reason) =
self.recordclient.isProgScheduledNow(prog, schedule)
if result:
status = 'scheduled'
Modified: branches/rel-1/freevo/src/www/htdocs/guidechannel.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/guidechannel.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/guidechannel.rpy Sat Mar 8
14:17:09 2008
@@ -64,11 +64,11 @@
def TimeBooked(self,prog):
bookedtime = False
for schedule_prog in self.schedule.values():
- if prog.start >=schedule_prog.start and prog.start <
schedule_prog.stop:
+ if prog.start >= schedule_prog.start and prog.start <
schedule_prog.stop:
bookedtime = True, schedule_prog
if not bookedtime:
schedule_prog = None
- return bookedtime , schedule_prog
+ return bookedtime, schedule_prog
def GetChannel(self, display_channel,guide):
for dchan in guide.chan_list:
Modified: branches/rel-1/freevo/src/www/htdocs/index.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/index.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/index.rpy Sat Mar 8 14:17:09 2008
@@ -53,7 +53,7 @@
(status, schedule) = RecordClient().getScheduledRecordingsNow()
- if schedule is None:
+ if status is None:
fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: '+_('Recording
server is not available')+'</p>\n'
else:
fv.res += '<p class="normal">'+_('Recording server is up and
running')+'</p>\n'
@@ -67,7 +67,7 @@
else:
fv.res += '<p class="normal">'+_('Your listings are up to
date')+'</p>\n'
- if schedule:
+ if status:
progl = schedule.getProgramList().values()
f = lambda a, b: cmp(a.start, b.start)
progl.sort(f)
Modified: branches/rel-1/freevo/src/www/htdocs/library.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/library.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/library.rpy Sat Mar 8 14:17:09 2008
@@ -334,7 +334,7 @@
favs = []
if action_mediatype == 'movies' or action_mediatype == 'rectv':
(status, schedule) =
self.recordclient.getScheduledRecordingsNow()
- if schedule:
+ if status:
progs = schedule.getProgramList()
f = lambda a, b: cmp(a.start, b.start)
progl = progs.values()
Modified: branches/rel-1/freevo/src/www/htdocs/record.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/record.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/record.rpy Sat Mar 8 14:17:09 2008
@@ -63,15 +63,16 @@
if action == 'remove':
(status, schedule) = self.recordclient.getScheduledRecordingsNow()
- progs = schedule.getProgramList()
+ if status:
+ progs = schedule.getProgramList()
- prog = None
- for what in progs.values():
- if start == '%s' % what.start and chan == '%s' %
what.channel_id:
- prog = what
+ prog = None
+ for what in progs.values():
+ if start == '%s' % what.start and chan == '%s' %
what.channel_id:
+ prog = what
- if prog:
- self.recordclient.removeScheduledRecordingNow(prog)
+ if prog:
+ self.recordclient.removeScheduledRecordingNow(prog)
elif action == 'add':
(status, prog) = self.recordclient.findProgNow(chan, start)
@@ -87,8 +88,9 @@
self.recordclient.scheduleRecordingNow(prog)
(status, schedule) = self.recordclient.getScheduledRecordingsNow()
- progs = schedule.getProgramList()
- favs = self.recordclient.getFavoritesNow()
+ if status:
+ progs = schedule.getProgramList()
+ favs = self.recordclient.getFavoritesNow()
fv.printHeader(_('Scheduled Recordings'), 'styles/main.css',
selected=_('Scheduled Recordings'))
Modified: branches/rel-1/freevo/src/www/htdocs/search.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/search.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/search.rpy Sat Mar 8 14:17:09 2008
@@ -134,13 +134,17 @@
fv.tableCell(cell, 'class="'+status+'" colspan="1"')
if status == 'scheduled':
- cell = ('<a
href="record.rpy?chan=%s&start=%s&action=remove">'+_('Remove')+'</a>') %
(prog.channel_id, prog.start)
+ cell = ('<a
href="record.rpy?chan=%s&start=%s&action=remove">'+_('Remove')+'</a>') % \
+ (prog.channel_id, prog.start)
elif status == 'recording':
- cell = ('<a
href="record.rpy?chan=%s&start=%s&action=add">'+_('Record')+'</a>') %
(prog.channel_id, prog.start)
+ cell = ('<a
href="record.rpy?chan=%s&start=%s&action=add">'+_('Record')+'</a>') % \
+ (prog.channel_id, prog.start)
else:
- cell = ('<a
href="record.rpy?chan=%s&start=%s&action=add">'+_('Record')+'</a>') %
(prog.channel_id, prog.start)
+ cell = ('<a
href="record.rpy?chan=%s&start=%s&action=add">'+_('Record')+'</a>') % \
+ (prog.channel_id, prog.start)
- cell += (' | <a
href="edit_favorite.rpy?chan=%s&start=%s&action=add">'+_('New
favorite')+'</a>') % (prog.channel_id, prog.start)
+ cell += (' | <a
href="edit_favorite.rpy?chan=%s&start=%s&action=add">'+_('New
favorite')+'</a>') % \
+ (prog.channel_id, prog.start)
fv.tableCell(cell, 'class="'+status+'" colspan="1"')
fv.tableRowClose()
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
