diff options
author | Calum Lind <calumlind@gmail.com> | 2018-10-14 21:14:48 +0100 |
---|---|---|
committer | Calum Lind <calumlind@gmail.com> | 2018-10-16 11:29:41 +0100 |
commit | ee354eb107642efc4d41e478cc3d7a7cbe7f2e3f (patch) | |
tree | c2f57ecb348b69bf5a961aba06aea1f7f3cf0933 /deluge/ui/web/server.py | |
parent | 7d896599b835808eef8dd29f104e4f980a0b3e7f (diff) | |
download | deluge-ee354eb107642efc4d41e478cc3d7a7cbe7f2e3f.tar.gz deluge-ee354eb107642efc4d41e478cc3d7a7cbe7f2e3f.tar.bz2 deluge-ee354eb107642efc4d41e478cc3d7a7cbe7f2e3f.zip |
[WebUI] Keep debug js in packaging and fix script lookup
Packaging:
- Decided that the debug files are useful for end-user so keep them in
package installation. For debug script_type to be usable all debug
file need to be avaialble so extjs debug files also included.
Script type selection:
- Fixed dev and debug request args to be properly decoded on Python 3,
otherwise comparison would fail and allowed any case for values.
- Modified the choosing of the script type to pick debug if specified
as previously always choosing dev type if dev version was True. A rare
scenario but useful but now debug is used if specified otherwise use dev.
- Changed the order when looking for alternative script types to start
with dev so that if debug is specified but missing it uses a similar
script type as previously would fallback to normal which is likely
undesired.
Diffstat (limited to 'deluge/ui/web/server.py')
-rw-r--r-- | deluge/ui/web/server.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index ae339dd44..b83cd4a18 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -564,15 +564,15 @@ class TopLevel(resource.Resource): def render(self, request): uri_true = ('true', 'yes', '1') - debug_arg = request.args.get('debug', [''])[-1] in uri_true - dev_arg = request.args.get('dev', [''])[-1] in uri_true + debug_arg = request.args.get('debug', [b''])[-1].decode().lower() in uri_true + 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' - # Override debug if dev arg or version. - if dev_arg or dev_ver: + elif dev_arg or dev_ver: + # Also use dev files if development version. script_type = 'dev' if not self.js.has_script_type_files(script_type): @@ -581,9 +581,10 @@ class TopLevel(resource.Resource): 'Failed to enable WebUI "%s" mode, script files are missing!', script_type, ) - # Fallback to checking other types in order and selecting first with files available. + # Fallback to checking other types in order and selecting first with + # files available. Ordered to start with dev files lookup. for alt_script_type in [ - x for x in ['normal', 'debug', 'dev'] if x != script_type + x for x in ['dev', 'debug', 'normal'] if x != script_type ]: if self.js.has_script_type_files(alt_script_type): script_type = alt_script_type |