mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-05 16:08:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[WebUI] Refactor host connect methods

Browse source
This commit is contained in:
Calum Lind 2017-06-16 07:57:14 +01:00
commit 2b90f309a6
1 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

44
deluge/ui/web/json_api.py
View file

@ -386,10 +386,21 @@ class WebApi(JSONComponent):
client.set_disconnect_callback(self._on_client_disconnect) client.set_disconnect_callback(self._on_client_disconnect)
default_host_id = component.get('DelugeWeb').config['default_daemon'] default_host_id = component.get('DelugeWeb').config['default_daemon']
if default_host_id: if default_host_id:
return self._connect_daemon(default_host_id) return self.connect(default_host_id)
return defer.succeed(True) return defer.succeed(True)
def _on_client_connect(self, *args):
"""Handles client successfully connecting to the daemon.
Invokes retrieving the method names and starts webapi and plugins.
"""
d_methods = self._json.get_remote_methods()
component.get('Web.PluginManager').start()
self.start()
return d_methods
def _on_client_disconnect(self, *args): def _on_client_disconnect(self, *args):
component.get('Web.PluginManager').stop() component.get('Web.PluginManager').stop()
return self.stop() return self.stop()
@ -403,34 +414,17 @@ class WebApi(JSONComponent):
self.sessionproxy.stop() self.sessionproxy.stop()
return defer.succeed(True) return defer.succeed(True)
def _connect_daemon(self, host_id):
"""
Connects the client to a daemon
"""
def on_client_connected(connection_id):
"""
Handles the client successfully connecting to the daemon and
invokes retrieving the method names.
"""
d = self._json.get_remote_methods()
component.get('Web.PluginManager').start()
self.start()
return d
return self.hostlist.connect_host(host_id).addCallback(on_client_connected)
@export @export
def connect(self, host_id): def connect(self, host_id):
""" """Connect the web client to a daemon.
Connect the client to a daemon
:param host_id: the id of the daemon in the host list Args:
:type host_id: string host_id (str): The id of the daemon in the host list.
:returns: the methods the daemon supports
:rtype: list Returns:
Deferred: List of methods the daemon supports.
""" """
return self._connect_daemon(host_id) return self.hostlist.connect_host(host_id).addCallback(self._on_client_connect)
@export @export
def connected(self): def connected(self):