Rezzect/deluge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WebUI] Enable debug URL parameter to parse false values

Browse Source 
When installed as a development version there was no way to load the
normal js scripts so improve the debug arg handling by parsing for false
values to force use of normal type scripts. Since debug arg overrides dev,
leave dev as is.
This commit is contained in:
Calum Lind 2018-10-16 10:04:44 +01:00
parent 467ade1eb7
commit ec47720686
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deluge/ui/web/server.py
View File

@ -563,14 +563,23 @@ class TopLevel(resource.Resource):
return resource.Resource.getChildWithDefault(self, path, request)
def render(self, request):
uri_true = ('true', 'yes', '1')
debug_arg = request.args.get('debug', [b''])[-1].decode().lower() in uri_true
uri_true = ('true', 'yes', 'on', '1')
uri_false = ('false', 'no', 'off', '0')
debug_arg = None
req_dbg_arg = request.args.get('debug', [b''])[-1].decode().lower()
if req_dbg_arg in uri_true:
debug_arg = True
elif req_dbg_arg in uri_false:
debug_arg = False
dev_arg = request.args.get('dev', [b''])[-1].decode().lower() in uri_true
dev_ver = 'dev' in common.get_version()
script_type = 'normal'
if debug_arg:
script_type = 'debug'
if debug_arg is not None:
# Use debug arg to force switching to normal script type.
script_type = 'debug' if debug_arg else 'normal'
elif dev_arg or dev_ver:
# Also use dev files if development version.
script_type = 'dev'
@ -606,7 +615,7 @@ class TopLevel(resource.Resource):
return template.render(
scripts=scripts,
stylesheets=self.stylesheets,
debug=str(debug_arg).lower(),
debug=str(bool(debug_arg)).lower(),
base=web_config['base'],
js_config=js_config,
)