Author: duncan
Date: Wed Feb 6 14:16:57 2008
New Revision: 10347
Log:
Run all through reindent.py
Modified:
branches/rel-1-7/freevo/src/encodingcore.py
branches/rel-1-7/freevo/src/helpers/encodingserver.py
branches/rel-1-7/freevo/src/tv/plugins/irsend_directv.py
branches/rel-1-7/freevo/src/video/encodingclient.py
branches/rel-1-7/freevo/src/www/htdocs/config.rpy
branches/rel-1-7/freevo/src/www/htdocs/guidechannel.rpy
branches/rel-1-7/freevo/src/www/htdocs/pluginconfig.rpy
branches/rel-1/freevo/src/encodingcore.py
branches/rel-1/freevo/src/helpers/encodingserver.py
branches/rel-1/freevo/src/tv/plugins/irsend_directv.py
branches/rel-1/freevo/src/video/encodingclient.py
branches/rel-1/freevo/src/www/htdocs/config.rpy
branches/rel-1/freevo/src/www/htdocs/guidechannel.rpy
branches/rel-1/freevo/src/www/htdocs/pluginconfig.rpy
Modified: branches/rel-1-7/freevo/src/encodingcore.py
==============================================================================
--- branches/rel-1-7/freevo/src/encodingcore.py (original)
+++ branches/rel-1-7/freevo/src/encodingcore.py Wed Feb 6 14:16:57 2008
@@ -91,7 +91,7 @@
'Inverse Telecine' : ['None', 'On (stateless filter)'],
'Denoise' : ['None', 'Normal denoise', 'HQ denoise'],
'iPod' : ['iPod']
- },
+ },
}
@@ -436,16 +436,16 @@
# set video encoder options
if self.altprofile == None:
- args = [
+ args = [
'-ovc', mappings['vcodec'][self.vcodec][0],
mappings['vcodec'][self.vcodec][1],
mappings['vcodec'][self.vcodec][2] % (self.vbrate,
self.threads, vpass, aspect ) ]
else: # Allow encoder options from client
aprofile = '%s:vbitrate=%s:threads=%s%s%s' % (self.altprofile,
self.vbrate, self.threads, vpass, aspect)
args = ['-ovc',
mappings['vcodec'][self.vcodec][0],mappings['vcodec'][self.vcodec][1], aprofile
]
-
+
# set audio encoder options
- args += ['-oac' , mappings['acodec'][self.acodec][0] ]
+ args += ['-oac' , mappings['acodec'][self.acodec][0] ]
if self.acodec != 'copy':
args += [ mappings['acodec'][self.acodec][1],
mappings['acodec'][self.acodec][2] % self.abrate ]
@@ -477,7 +477,7 @@
#if we scale, use the bilinear algorithm
if yscaled:
args += ['-sws', '1']
-
+
return args
Modified: branches/rel-1-7/freevo/src/helpers/encodingserver.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/encodingserver.py (original)
+++ branches/rel-1-7/freevo/src/helpers/encodingserver.py Wed Feb 6
14:16:57 2008
@@ -106,8 +106,8 @@
while not self.jobs[idnr].finishedanalyze:
time.sleep(0.1)
if self.jobs[idnr].finishedanalyze == True and self.jobs[idnr].failed
== True:
- _debug_('Analysis failed')
- return (False,10)
+ _debug_('Analysis failed')
+ return (False,10)
_debug_("Initialized job %s (idnr : %s)" % (friendlyname, idnr), DINFO)
Modified: branches/rel-1-7/freevo/src/tv/plugins/irsend_directv.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/plugins/irsend_directv.py (original)
+++ branches/rel-1-7/freevo/src/tv/plugins/irsend_directv.py Wed Feb 6
14:16:57 2008
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# Send commands to a DirecTV receiver using a shell command like
+# Send commands to a DirecTV receiver using a shell command like
# irsend from Lirc.
# -----------------------------------------------------------------------
# $Id$
@@ -26,7 +26,7 @@
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
+# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# -----------------------------------------------------------------------
@@ -47,7 +47,7 @@
Example usage (local_conf.py):
- plugin_external_tuner = plugin.activate('tv.irsend_directv',
+ plugin_external_tuner = plugin.activate('tv.irsend_directv',
args=('/usr/bin/irsend SEND_ONCE <remote_name>', '/usr/bin/irsend
SET_TRANSMITTER',))
Where <remote_name> is the name of the remote you are using to send codes
Modified: branches/rel-1-7/freevo/src/video/encodingclient.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/encodingclient.py (original)
+++ branches/rel-1-7/freevo/src/video/encodingclient.py Wed Feb 6 14:16:57 2008
@@ -121,7 +121,7 @@
if not (source or output):
return (False, "EncodingClient: no source and/or output")
- try:
+ try:
(status, response) = server.initEncodeJob(source, output,
friendlyname, title)
except:
print "Unexpected error:", sys.exc_info()[0]
@@ -141,7 +141,7 @@
response = server.getContainerCAP()
except:
return (False ,'EncodingClient: connection error')
-
+
return (True, response )
def setContainer(idnr, container):
@@ -182,7 +182,7 @@
returned by getVideoCodecCAP.
@param tgtsize: is the target size of the encoded file, in megabytes (this
includes
audio data and container format overhead)
- @param multipass: is a boolean. Set this to True if you want multipass
encoding
+ @param multipass: is a boolean. Set this to True if you want multipass
encoding
( 1 pass, 2 video passes). The default is no multipass ( 1 video)
@param vbitrate: is the video bitrate, if it is not 0 then this value is
used instead
of using the tgtsize.
Modified: branches/rel-1-7/freevo/src/www/htdocs/config.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/config.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/config.rpy Wed Feb 6 14:16:57 2008
@@ -106,7 +106,7 @@
cfg_control.endline = cnt
cfg_control.control_name = cfg_control.ctrlname + '_' +
str(startline)
fconfig.append(cfg_control)
-
+
cnt += 1
#fconfig.sort(key=operator.itemgetter('control_name'))
@@ -124,7 +124,7 @@
self.fileline = None
self.control_name = None
self.control_type = None
-
+
tln = config_line.strip()
tln = tln.replace('\n', '')
@@ -655,7 +655,7 @@
return htmlctrl
-
+
def DisplayConfigChanges(current_version):
'''
@@ -702,8 +702,8 @@
if setting.ctrlname == 'CONFIG_VERSION':
return setting.ctrlvalue
return None
-
-
+
+
class ConfigResource(FreevoResource):
def __init__(self):
@@ -711,7 +711,7 @@
self.expand_all = False
print 'Config Resourese'
-
+
def DisplayGroups(self,fconfig):
'''
'''
@@ -742,7 +742,7 @@
'''
'''
_debug_('DisplayGroups(fconfig=%r)' % (fconfig), 2)
-
+
groups = GetGroupList(fconfig)
displayStyle = 'none'
if self.expand_all:
@@ -750,12 +750,12 @@
html = ''
for cctrl in fconfig:
-
+
if cctrl.group == grp:
if cctrl.enabled:
html += '<li class="LineOpen" id="%s_line">\n' %
cctrl.control_name
html += CreateConfigLine(cctrl, self.expand_all)
- html += '</li>\n'
+ html += '</li>\n'
else:
if not self.hide_disabled:
html += '<li class="LineOpen" id="%s_line">\n' %
cctrl.control_name
@@ -763,7 +763,7 @@
html += '</li>\n'
return html
-
+
def _render(self, request):
'''
'''
@@ -782,14 +782,14 @@
if not configfile:
fv.res += 'Unable to find file.'
return fv.res
-
- wizard_groups =
['Tv','Video','Audio','Image','Headline','Www','All','Config
Changes','Options']
+
+ wizard_groups =
['Tv','Video','Audio','Image','Headline','Www','All','Config Changes','Options']
current_group = fv.formValue(form,"current_group")
if not current_group:
current_group = "Tv"
if not current_group in wizard_groups:
current_group = "Tv"
-
+
rconf = ReadConfig(configfile)
fconfig = ParseConfigFile(rconf)
@@ -828,17 +828,17 @@
fv.res += '</li>\n'
fv.res += '</ul>\n'
fv.res += '</div>\n<br><br>'
-
+
if current_group == "All":
fv.res += self.DisplayGroups(fconfig)
elif current_group == 'Config Changes':
local_conf_ver = GetConfigVersion(fconfig)
- fv.res += DisplayConfigChanges(local_conf_ver)
+ fv.res += DisplayConfigChanges(local_conf_ver)
elif current_group == 'Options':
fv.res += 'Create Options !!'
else:
fv.res += self.DisplayGroup(current_group,fconfig)
-
+
fv.res + '</div>\n'
return str(fv.res)
Modified: branches/rel-1-7/freevo/src/www/htdocs/guidechannel.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/guidechannel.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/guidechannel.rpy Wed Feb 6
14:16:57 2008
@@ -55,7 +55,7 @@
clist = []
for dchan in guide.chan_list:
clist.append(dchan.displayname)
-
+
return clist
def TimeBooked(self,prog):
@@ -65,8 +65,8 @@
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:
if display_channel == dchan.displayname:
@@ -75,13 +75,13 @@
def CreateChannelLine(self,prog):
status = "programline"
-
+
bookedtime, sch_prog = self.TimeBooked(prog)
program_tip = ''
if bookedtime:
status = 'programtimebooked'
program_tip = 'Scheduled Program : %s' %
Unicode(sch_prog.sub_title)
-
+
if self.got_schedule:
(result, message) = ri.isProgScheduled(prog, self.schedule)
if result:
@@ -95,7 +95,7 @@
popid = '%s:%s' % (prog.channel_id, prog.start)
pstarttime = time.localtime(prog.start)
pstart = time.strftime(config.TV_TIME_FORMAT,pstarttime)
- channel_line += '<li id="%s">\n' % status
+ channel_line += '<li id="%s">\n' % status
channel_line += '<a id="%s" name="%s" onclick="guide_click(this,
event)"> %s %s </a>\n' % (popid,program_tip,pstart,cell)
channel_line += '<ul>\n'
channel_line += '<li id="description">\n'
@@ -156,28 +156,28 @@
html += "<iframe id='bookedhidden' style='visibility: hidden; width:
1px; height: 1px'></iframe>\n"
return html
-
+
def GetChannelPrograms(self,channel):
channel_programs = '<ul id="daylistcontainer">\n'
current_day =''
-
+
for prog in channel.programs:
-
+
if prog.stop > self.currenttime:
# if self.TimeBooked(prog):
-
+
if time.strftime('%b %d (%a)', time.localtime(prog.start)) <>
current_day:
if current_day <> '':
channel_programs += '</ul>\n'
channel_programs += '</li>\n'
-
+
current_day = time.strftime('%b %d (%a)',
time.localtime(prog.start))
js_onclick = "ShowList('%s')" % current_day
channel_programs += '<li id="dayline">\n'
channel_programs += '<a onclick="%s"
id="current">%s</a>\n' % (js_onclick,current_day)
channel_programs += '<ul id="%s" class="subnavlist">\n' %
(current_day)
channel_programs += self.CreateChannelLine(prog)
-
+
channel_programs += '</ul>\n'
return channel_programs
@@ -186,11 +186,11 @@
def _render(self, request):
fv = HTMLResource()
form = request.args
-
+
self.guide = tv.epg_xmltv.get_guide()
(self.got_schedule, self.schedule) = ri.getScheduledRecordings()
self.currenttime = time.time()
-
+
if self.got_schedule:
self.schedule = self.schedule.getProgramList()
@@ -198,34 +198,34 @@
fv.res += '<link rel="stylesheet" href="styles/guidechannel.css"
type="text/css" media="screen">\n'
fv.res += '<div id="content">\n';
fv.res += ' <br/>\n'
-
+
if not self.got_schedule:
fv.printMessages(
[ '<b>'+_('ERROR')+'</b>: '+_('Recording server is
unavailable.') ]
)
-
+
display_channel = fv.formValue(form,'channel')
if not display_channel:
display_channel = self.guide.chan_list[0].displayname
clist = []
-
+
getprogramlist = fv.formValue(form,'getprogramlist')
if getprogramlist:
chan = self.GetChannel(getprogramlist,self.guide)
fv.res = self.GetChannelPrograms(chan)
-
+
return String(fv.res)
-
+
dchan = self.GetChannel(display_channel,self.guide)
fv.res += '<script language="JavaScript" type="text/JavaScript"
src="scripts/guidechannel.js"></script>\n'
js_onclick = "ChangeChannel(this)"
ctrl_opts = 'onchange="%s"' % js_onclick
clist = self.GetChannelList(self.guide)
fv.res +=
CreateSelectBoxControl('channel',clist,display_channel,ctrl_opts)
-
+
if not dchan.programs:
fv.res += 'This channel has no data loaded\n'
-
+
channel_programs = self.GetChannelPrograms(dchan)
fv.res += '<div id="ProgramList">\n'
fv.res += channel_programs
Modified: branches/rel-1-7/freevo/src/www/htdocs/pluginconfig.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/pluginconfig.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/pluginconfig.rpy Wed Feb 6
14:16:57 2008
@@ -114,8 +114,8 @@
conf_line = lcline['orgline']
linenumber = lcline['lineno']
confentry = True
- return conf_line, linenumber
-
+ return conf_line, linenumber
+
def plugin_level_control(lconf_line, plugin):
'''
@@ -180,7 +180,7 @@
self.plugin_name = plugin
self.plugin_args = get_plugin_args(self.lconfline)
self.line_control = CreateHTMLinput('hidden',self.plugin_name +
'_lineno', str(self.linenumber) , '','')
-
+
def status(self):
'''
'''
@@ -294,8 +294,8 @@
return dsp_vars
-
-
+
+
class ConfigurePluginsResource(FreevoResource):
def __init__(self):
@@ -329,7 +329,7 @@
pluginname = plugin[1][0]
pluginctrl = displayplugin(self.configfile, plugin[1],
lcplugins, self.expandAll, self.current_group)
grouplist += pluginctrl
-
+
grouplist += '</ul>\n'
return Unicode(grouplist)
@@ -367,7 +367,7 @@
self.all_plugins = config.all_plugins
group_list = ['Global', 'tv', 'video', 'audio', 'image', 'idlebar',
'servers','helpers']
group_list.sort()
-
+
self.plugin_grps = group_list
splugins = self.SortPlugins()
@@ -381,14 +381,14 @@
fv.res += '<link rel="stylesheet" href="styles/config.css"
type="text/css" />\n'
fv.res += CreateHTMLinput('hidden','configfile',self.configfile,'','')
-
+
fv.res += ' <div id="ConfigGroup">'
fv.res += '<ul>'
-
+
self.current_group = fv.formValue(form,'current_group')
if not self.current_group:
self.current_group = 'Global'
-
+
for group in self.plugin_grps:
group_id = ""
if self.current_group == group:
@@ -398,11 +398,11 @@
fv.res += '</li>\n'
fv.res += '</ul>\n'
fv.res += '</div>\n<br><br>'
-
+
fv.res += '<div class="VarGroups">\n'
fv.res += '<form action="#" class="searchform">\n'
fv.res += '<ul>\n'
- fv.res += '<li class="Plugin_Group">\n'
+ fv.res += '<li class="Plugin_Group">\n'
fv.res += self.display_group(splugins, lcplugins)
fv.res += '</li>\n'
fv.res += '</div>\n'
Modified: branches/rel-1/freevo/src/encodingcore.py
==============================================================================
--- branches/rel-1/freevo/src/encodingcore.py (original)
+++ branches/rel-1/freevo/src/encodingcore.py Wed Feb 6 14:16:57 2008
@@ -91,7 +91,7 @@
'Inverse Telecine' : ['None', 'On (stateless filter)'],
'Denoise' : ['None', 'Normal denoise', 'HQ denoise'],
'iPod' : ['iPod']
- },
+ },
}
@@ -436,16 +436,16 @@
# set video encoder options
if self.altprofile == None:
- args = [
+ args = [
'-ovc', mappings['vcodec'][self.vcodec][0],
mappings['vcodec'][self.vcodec][1],
mappings['vcodec'][self.vcodec][2] % (self.vbrate,
self.threads, vpass, aspect ) ]
else: # Allow encoder options from client
aprofile = '%s:vbitrate=%s:threads=%s%s%s' % (self.altprofile,
self.vbrate, self.threads, vpass, aspect)
args = ['-ovc',
mappings['vcodec'][self.vcodec][0],mappings['vcodec'][self.vcodec][1], aprofile
]
-
+
# set audio encoder options
- args += ['-oac' , mappings['acodec'][self.acodec][0] ]
+ args += ['-oac' , mappings['acodec'][self.acodec][0] ]
if self.acodec != 'copy':
args += [ mappings['acodec'][self.acodec][1],
mappings['acodec'][self.acodec][2] % self.abrate ]
@@ -477,7 +477,7 @@
#if we scale, use the bilinear algorithm
if yscaled:
args += ['-sws', '1']
-
+
return args
Modified: branches/rel-1/freevo/src/helpers/encodingserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/encodingserver.py (original)
+++ branches/rel-1/freevo/src/helpers/encodingserver.py Wed Feb 6 14:16:57 2008
@@ -106,8 +106,8 @@
while not self.jobs[idnr].finishedanalyze:
time.sleep(0.1)
if self.jobs[idnr].finishedanalyze == True and self.jobs[idnr].failed
== True:
- _debug_('Analysis failed')
- return (False,10)
+ _debug_('Analysis failed')
+ return (False,10)
_debug_("Initialized job %s (idnr : %s)" % (friendlyname, idnr), DINFO)
Modified: branches/rel-1/freevo/src/tv/plugins/irsend_directv.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/irsend_directv.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/irsend_directv.py Wed Feb 6
14:16:57 2008
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# Send commands to a DirecTV receiver using a shell command like
+# Send commands to a DirecTV receiver using a shell command like
# irsend from Lirc.
# -----------------------------------------------------------------------
# $Id$
@@ -26,7 +26,7 @@
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
+# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# -----------------------------------------------------------------------
@@ -47,7 +47,7 @@
Example usage (local_conf.py)::
- plugin_external_tuner = plugin.activate('tv.irsend_directv',
+ plugin_external_tuner = plugin.activate('tv.irsend_directv',
args=('/usr/bin/irsend SEND_ONCE <remote_name>', '/usr/bin/irsend
SET_TRANSMITTER',))
Where <remote_name> is the name of the remote you are using to send codes
Modified: branches/rel-1/freevo/src/video/encodingclient.py
==============================================================================
--- branches/rel-1/freevo/src/video/encodingclient.py (original)
+++ branches/rel-1/freevo/src/video/encodingclient.py Wed Feb 6 14:16:57 2008
@@ -121,7 +121,7 @@
if not (source or output):
return (False, "EncodingClient: no source and/or output")
- try:
+ try:
(status, response) = server.initEncodeJob(source, output,
friendlyname, title)
except:
print "Unexpected error:", sys.exc_info()[0]
@@ -141,7 +141,7 @@
response = server.getContainerCAP()
except:
return (False ,'EncodingClient: connection error')
-
+
return (True, response )
def setContainer(idnr, container):
@@ -182,7 +182,7 @@
returned by getVideoCodecCAP.
@param tgtsize: is the target size of the encoded file, in megabytes (this
includes
audio data and container format overhead)
- @param multipass: is a boolean. Set this to True if you want multipass
encoding
+ @param multipass: is a boolean. Set this to True if you want multipass
encoding
( 1 pass, 2 video passes). The default is no multipass ( 1 video)
@param vbitrate: is the video bitrate, if it is not 0 then this value is
used instead
of using the tgtsize.
Modified: branches/rel-1/freevo/src/www/htdocs/config.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/config.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/config.rpy Wed Feb 6 14:16:57 2008
@@ -106,7 +106,7 @@
cfg_control.endline = cnt
cfg_control.control_name = cfg_control.ctrlname + '_' +
str(startline)
fconfig.append(cfg_control)
-
+
cnt += 1
#fconfig.sort(key=operator.itemgetter('control_name'))
@@ -124,7 +124,7 @@
self.fileline = None
self.control_name = None
self.control_type = None
-
+
tln = config_line.strip()
tln = tln.replace('\n', '')
@@ -655,7 +655,7 @@
return htmlctrl
-
+
def DisplayConfigChanges(current_version):
'''
@@ -702,8 +702,8 @@
if setting.ctrlname == 'CONFIG_VERSION':
return setting.ctrlvalue
return None
-
-
+
+
class ConfigResource(FreevoResource):
def __init__(self):
@@ -711,7 +711,7 @@
self.expand_all = False
print 'Config Resourese'
-
+
def DisplayGroups(self,fconfig):
'''
'''
@@ -742,7 +742,7 @@
'''
'''
_debug_('DisplayGroups(fconfig=%r)' % (fconfig), 2)
-
+
groups = GetGroupList(fconfig)
displayStyle = 'none'
if self.expand_all:
@@ -750,12 +750,12 @@
html = ''
for cctrl in fconfig:
-
+
if cctrl.group == grp:
if cctrl.enabled:
html += '<li class="LineOpen" id="%s_line">\n' %
cctrl.control_name
html += CreateConfigLine(cctrl, self.expand_all)
- html += '</li>\n'
+ html += '</li>\n'
else:
if not self.hide_disabled:
html += '<li class="LineOpen" id="%s_line">\n' %
cctrl.control_name
@@ -763,7 +763,7 @@
html += '</li>\n'
return html
-
+
def _render(self, request):
'''
'''
@@ -782,14 +782,14 @@
if not configfile:
fv.res += 'Unable to find file.'
return fv.res
-
- wizard_groups =
['Tv','Video','Audio','Image','Headline','Www','All','Config
Changes','Options']
+
+ wizard_groups =
['Tv','Video','Audio','Image','Headline','Www','All','Config Changes','Options']
current_group = fv.formValue(form,"current_group")
if not current_group:
current_group = "Tv"
if not current_group in wizard_groups:
current_group = "Tv"
-
+
rconf = ReadConfig(configfile)
fconfig = ParseConfigFile(rconf)
@@ -828,17 +828,17 @@
fv.res += '</li>\n'
fv.res += '</ul>\n'
fv.res += '</div>\n<br><br>'
-
+
if current_group == "All":
fv.res += self.DisplayGroups(fconfig)
elif current_group == 'Config Changes':
local_conf_ver = GetConfigVersion(fconfig)
- fv.res += DisplayConfigChanges(local_conf_ver)
+ fv.res += DisplayConfigChanges(local_conf_ver)
elif current_group == 'Options':
fv.res += 'Create Options !!'
else:
fv.res += self.DisplayGroup(current_group,fconfig)
-
+
fv.res + '</div>\n'
return str(fv.res)
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 Wed Feb 6
14:16:57 2008
@@ -55,7 +55,7 @@
clist = []
for dchan in guide.chan_list:
clist.append(dchan.displayname)
-
+
return clist
def TimeBooked(self,prog):
@@ -65,8 +65,8 @@
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:
if display_channel == dchan.displayname:
@@ -75,13 +75,13 @@
def CreateChannelLine(self,prog):
status = "programline"
-
+
bookedtime, sch_prog = self.TimeBooked(prog)
program_tip = ''
if bookedtime:
status = 'programtimebooked'
program_tip = 'Scheduled Program : %s' %
Unicode(sch_prog.sub_title)
-
+
if self.got_schedule:
(result, message) = ri.isProgScheduled(prog, self.schedule)
if result:
@@ -95,7 +95,7 @@
popid = '%s:%s' % (prog.channel_id, prog.start)
pstarttime = time.localtime(prog.start)
pstart = time.strftime(config.TV_TIME_FORMAT,pstarttime)
- channel_line += '<li id="%s">\n' % status
+ channel_line += '<li id="%s">\n' % status
channel_line += '<a id="%s" name="%s" onclick="guide_click(this,
event)"> %s %s </a>\n' % (popid,program_tip,pstart,cell)
channel_line += '<ul>\n'
channel_line += '<li id="description">\n'
@@ -156,28 +156,28 @@
html += "<iframe id='bookedhidden' style='visibility: hidden; width:
1px; height: 1px'></iframe>\n"
return html
-
+
def GetChannelPrograms(self,channel):
channel_programs = '<ul id="daylistcontainer">\n'
current_day =''
-
+
for prog in channel.programs:
-
+
if prog.stop > self.currenttime:
# if self.TimeBooked(prog):
-
+
if time.strftime('%b %d (%a)', time.localtime(prog.start)) <>
current_day:
if current_day <> '':
channel_programs += '</ul>\n'
channel_programs += '</li>\n'
-
+
current_day = time.strftime('%b %d (%a)',
time.localtime(prog.start))
js_onclick = "ShowList('%s')" % current_day
channel_programs += '<li id="dayline">\n'
channel_programs += '<a onclick="%s"
id="current">%s</a>\n' % (js_onclick,current_day)
channel_programs += '<ul id="%s" class="subnavlist">\n' %
(current_day)
channel_programs += self.CreateChannelLine(prog)
-
+
channel_programs += '</ul>\n'
return channel_programs
@@ -186,11 +186,11 @@
def _render(self, request):
fv = HTMLResource()
form = request.args
-
+
self.guide = tv.epg_xmltv.get_guide()
(self.got_schedule, self.schedule) = ri.getScheduledRecordings()
self.currenttime = time.time()
-
+
if self.got_schedule:
self.schedule = self.schedule.getProgramList()
@@ -198,34 +198,34 @@
fv.res += '<link rel="stylesheet" href="styles/guidechannel.css"
type="text/css" media="screen">\n'
fv.res += '<div id="content">\n';
fv.res += ' <br/>\n'
-
+
if not self.got_schedule:
fv.printMessages(
[ '<b>'+_('ERROR')+'</b>: '+_('Recording server is
unavailable.') ]
)
-
+
display_channel = fv.formValue(form,'channel')
if not display_channel:
display_channel = self.guide.chan_list[0].displayname
clist = []
-
+
getprogramlist = fv.formValue(form,'getprogramlist')
if getprogramlist:
chan = self.GetChannel(getprogramlist,self.guide)
fv.res = self.GetChannelPrograms(chan)
-
+
return String(fv.res)
-
+
dchan = self.GetChannel(display_channel,self.guide)
fv.res += '<script language="JavaScript" type="text/JavaScript"
src="scripts/guidechannel.js"></script>\n'
js_onclick = "ChangeChannel(this)"
ctrl_opts = 'onchange="%s"' % js_onclick
clist = self.GetChannelList(self.guide)
fv.res +=
CreateSelectBoxControl('channel',clist,display_channel,ctrl_opts)
-
+
if not dchan.programs:
fv.res += 'This channel has no data loaded\n'
-
+
channel_programs = self.GetChannelPrograms(dchan)
fv.res += '<div id="ProgramList">\n'
fv.res += channel_programs
Modified: branches/rel-1/freevo/src/www/htdocs/pluginconfig.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/pluginconfig.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/pluginconfig.rpy Wed Feb 6
14:16:57 2008
@@ -114,8 +114,8 @@
conf_line = lcline['orgline']
linenumber = lcline['lineno']
confentry = True
- return conf_line, linenumber
-
+ return conf_line, linenumber
+
def plugin_level_control(lconf_line, plugin):
'''
@@ -180,7 +180,7 @@
self.plugin_name = plugin
self.plugin_args = get_plugin_args(self.lconfline)
self.line_control = CreateHTMLinput('hidden',self.plugin_name +
'_lineno', str(self.linenumber) , '','')
-
+
def status(self):
'''
'''
@@ -294,8 +294,8 @@
return dsp_vars
-
-
+
+
class ConfigurePluginsResource(FreevoResource):
def __init__(self):
@@ -329,7 +329,7 @@
pluginname = plugin[1][0]
pluginctrl = displayplugin(self.configfile, plugin[1],
lcplugins, self.expandAll, self.current_group)
grouplist += pluginctrl
-
+
grouplist += '</ul>\n'
return Unicode(grouplist)
@@ -367,7 +367,7 @@
self.all_plugins = config.all_plugins
group_list = ['Global', 'tv', 'video', 'audio', 'image', 'idlebar',
'servers','helpers']
group_list.sort()
-
+
self.plugin_grps = group_list
splugins = self.SortPlugins()
@@ -381,14 +381,14 @@
fv.res += '<link rel="stylesheet" href="styles/config.css"
type="text/css" />\n'
fv.res += CreateHTMLinput('hidden','configfile',self.configfile,'','')
-
+
fv.res += ' <div id="ConfigGroup">'
fv.res += '<ul>'
-
+
self.current_group = fv.formValue(form,'current_group')
if not self.current_group:
self.current_group = 'Global'
-
+
for group in self.plugin_grps:
group_id = ""
if self.current_group == group:
@@ -398,11 +398,11 @@
fv.res += '</li>\n'
fv.res += '</ul>\n'
fv.res += '</div>\n<br><br>'
-
+
fv.res += '<div class="VarGroups">\n'
fv.res += '<form action="#" class="searchform">\n'
fv.res += '<ul>\n'
- fv.res += '<li class="Plugin_Group">\n'
+ fv.res += '<li class="Plugin_Group">\n'
fv.res += self.display_group(splugins, lcplugins)
fv.res += '</li>\n'
fv.res += '</div>\n'
-------------------------------------------------------------------------
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
