rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor qutehandlers so they are not classmethods.

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-12 20:27:20 +02:00
parent 16caa9ba69
commit 2336b5de43
1 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
qutebrowser/network/qutescheme.py
View File

@ -31,8 +31,7 @@ from PyQt5.QtNetwork import QNetworkReply
import qutebrowser import qutebrowser
from qutebrowser.network import schemehandler from qutebrowser.network import schemehandler
from qutebrowser.utils import version, utils, jinja from qutebrowser.utils import version, utils, jinja, log
from qutebrowser.utils import log as logutils
pyeval_output = ":pyeval was never called" pyeval_output = ":pyeval was never called"
@ -56,14 +55,14 @@ class QuteSchemeHandler(schemehandler.SchemeHandler):
path = request.url().path() path = request.url().path()
host = request.url().host() host = request.url().host()
# An url like "qute:foo" is split as "scheme:path", not "scheme:host". # An url like "qute:foo" is split as "scheme:path", not "scheme:host".
logutils.misc.debug("url: {}, path: {}, host {}".format( log.misc.debug("url: {}, path: {}, host {}".format(
request.url().toDisplayString(), path, host)) request.url().toDisplayString(), path, host))
try: try:
handler = getattr(QuteHandlers, path) handler = HANDLERS[path]
except AttributeError: except KeyError:
try: try:
handler = getattr(QuteHandlers, host) handler = HANDLERS[host]
except AttributeError: except KeyError:
errorstr = "No handler found for {}!".format( errorstr = "No handler found for {}!".format(
request.url().toDisplayString()) request.url().toDisplayString())
return schemehandler.ErrorNetworkReply( return schemehandler.ErrorNetworkReply(
@ -79,58 +78,63 @@ class QuteSchemeHandler(schemehandler.SchemeHandler):
request, data, 'text/html', self.parent()) request, data, 'text/html', self.parent())
class QuteHandlers: def qute_pyeval(_request):
"""Handler for qute:pyeval. Return HTML content as bytes."""
html = jinja.env.get_template('pre.html').render(
title='pyeval', content=pyeval_output)
return html.encode('UTF-8', errors='xmlcharrefreplace')
"""Handlers for qute:... pages."""
@classmethod def qute_version(_request):
def pyeval(cls, _request): """Handler for qute:version. Return HTML content as bytes."""
"""Handler for qute:pyeval. Return HTML content as bytes.""" html = jinja.env.get_template('version.html').render(
html = jinja.env.get_template('pre.html').render( title='Version info', version=version.version(),
title='pyeval', content=pyeval_output) copyright=qutebrowser.__copyright__)
return html.encode('UTF-8', errors='xmlcharrefreplace') return html.encode('UTF-8', errors='xmlcharrefreplace')
@classmethod
def version(cls, _request):
"""Handler for qute:version. Return HTML content as bytes."""
html = jinja.env.get_template('version.html').render(
title='Version info', version=version.version(),
copyright=qutebrowser.__copyright__)
return html.encode('UTF-8', errors='xmlcharrefreplace')
@classmethod def qute_plainlog(_request):
def plainlog(cls, _request): """Handler for qute:plainlog. Return HTML content as bytes."""
"""Handler for qute:plainlog. Return HTML content as bytes.""" if log.ram_handler is None:
if logutils.ram_handler is None: text = "Log output was disabled."
text = "Log output was disabled." else:
else: text = log.ram_handler.dump_log()
text = logutils.ram_handler.dump_log() html = jinja.env.get_template('pre.html').render(title='log', content=text)
html = jinja.env.get_template('pre.html').render( return html.encode('UTF-8', errors='xmlcharrefreplace')
title='log', content=text)
return html.encode('UTF-8', errors='xmlcharrefreplace')
@classmethod
def log(cls, _request):
"""Handler for qute:log. Return HTML content as bytes."""
if logutils.ram_handler is None:
html_log = None
else:
html_log = logutils.ram_handler.dump_log(html=True)
html = jinja.env.get_template('log.html').render(
title='log', content=html_log)
return html.encode('UTF-8', errors='xmlcharrefreplace')
@classmethod def qute_log(_request):
def gpl(cls, _request): """Handler for qute:log. Return HTML content as bytes."""
"""Handler for qute:gpl. Return HTML content as bytes.""" if log.ram_handler is None:
return utils.read_file('html/COPYING.html').encode('ASCII') html_log = None
else:
html_log = log.ram_handler.dump_log(html=True)
html = jinja.env.get_template('log.html').render(
title='log', content=html_log)
return html.encode('UTF-8', errors='xmlcharrefreplace')
def qute_gpl(_request):
"""Handler for qute:gpl. Return HTML content as bytes."""
return utils.read_file('html/COPYING.html').encode('ASCII')
def qute_help(request):
"""Handler for qute:help. Return HTML content as bytes."""
urlpath = request.url().path()
if not urlpath or urlpath == '/':
urlpath = 'index.html'
path = 'html/doc/{}'.format(urlpath)
return utils.read_file(path).encode('UTF-8', errors='xmlcharrefreplace')
HANDLERS = {
'pyeval': qute_pyeval,
'version': qute_version,
'plainlog': qute_plainlog,
'log': qute_log,
'gpl': qute_gpl,
'help': qute_help,
}
@classmethod
def help(cls, request):
"""Handler for qute:help. Return HTML content as bytes."""
urlpath = request.url().path()
if not urlpath or urlpath == '/':
urlpath = 'index.html'
path = 'html/doc/{}'.format(urlpath)
return utils.read_file(path).encode('UTF-8',
errors='xmlcharrefreplace')