diff options
author | DjLegolas <DjLegolas@users.noreply.github.com> | 2018-07-14 21:33:05 +0300 |
---|---|---|
committer | Calum Lind <calumlind@gmail.com> | 2018-10-21 15:43:29 +0100 |
commit | 9264cb749e9f44a4c9f8ace5fff9c6f0707e1618 (patch) | |
tree | 2cbac39bfce5681e96e29e178f004716b2fc4d33 /deluge/ui/web/server.py | |
parent | c01679de1f24ea114d4ce11e8ad8ab4adc3d6fd2 (diff) | |
download | deluge-9264cb749e9f44a4c9f8ace5fff9c6f0707e1618.tar.gz deluge-9264cb749e9f44a4c9f8ace5fff9c6f0707e1618.tar.bz2 deluge-9264cb749e9f44a4c9f8ace5fff9c6f0707e1618.zip |
[WebUI][#2009] Add About window
- Add an About window to see version details like GTKUI.
- The author and license text were left out as unnecessary.
- Added a daemon get_version method since daemon version was not
available through the json-api.
- Fix LookupResource to ensure path exists when rendering.
Diffstat (limited to 'deluge/ui/web/server.py')
-rw-r--r-- | deluge/ui/web/server.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index 15d4c4353..d85205842 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -251,8 +251,8 @@ class LookupResource(resource.Resource, component.Component): if path in self.__paths: filename = os.path.basename(request.path).decode() for directory in self.__paths[path]: - if os.path.join(directory, filename): - path = os.path.join(directory, filename) + path = os.path.join(directory, filename) + if os.path.isfile(path): log.debug('Serving path: %s', path) mime_type = mimetypes.guess_type(path) request.setHeader(b'content-type', mime_type[0].encode()) @@ -461,6 +461,12 @@ class TopLevel(resource.Resource): self.putChild(b'flag', Flag()) self.putChild(b'icons', LookupResource('Icons', rpath('icons'))) self.putChild(b'images', LookupResource('Images', rpath('images'))) + self.putChild( + b'ui_images', + LookupResource( + 'UI_Images', common.resource_filename('deluge.ui.data', 'pixmaps') + ), + ) js = ScriptResource() |