codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Web] Fix error in WebApi in standalone mode 

In GTKUI standalone mode, WebApi.enable would try to connect to
daemon if web.conf had the 'default_daemon' option set, causing
the client calls to break.
This commit is contained in:
bendikro 2016-04-18 19:17:05 +02:00 committed by Calum Lind
parent 38e0bc1257
commit e370d7dbdd
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
deluge/ui/web/json_api.py
View File

@ -383,18 +383,21 @@ class WebApi(JSONComponent):
client.set_disconnect_callback(None)
def enable(self):
if not client.is_classicmode():
client.set_disconnect_callback(self._on_client_disconnect)
client.register_event_handler("PluginEnabledEvent", self._json.get_remote_methods)
client.register_event_handler("PluginDisabledEvent", self._json.get_remote_methods)
if component.get("DelugeWeb").config["default_daemon"]:
# Sort out getting the default daemon here
default = component.get("DelugeWeb").config["default_daemon"]
host = component.get("Web")._get_host(default)
if host:
return self._connect_daemon(*host[1:])
else:
return self._connect_daemon()
if not client.is_classicmode():
client.set_disconnect_callback(self._on_client_disconnect)
if component.get("DelugeWeb").config["default_daemon"]:
# Sort out getting the default daemon here
default = component.get("DelugeWeb").config["default_daemon"]
host = component.get("Web")._get_host(default)
if host:
return self._connect_daemon(*host[1:])
else:
return self._connect_daemon()
return defer.succeed(True)
def _on_client_disconnect(self, *args):