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

fix some indentation issues

Browse source
This commit is contained in:
Damien Churchill 2009-06-27 11:36:34 +00:00
commit cdf2f79c66
1 changed files with 78 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -272,7 +272,7 @@ DEFAULT_PORT = 58846
DEFAULT_HOSTS = { DEFAULT_HOSTS = {
"hosts": [(hashlib.sha1(str(time.time())).hexdigest(), "hosts": [(hashlib.sha1(str(time.time())).hexdigest(),
DEFAULT_HOST, DEFAULT_PORT, "", "")] DEFAULT_HOST, DEFAULT_PORT, "", "")]
} }
HOSTLIST_ID = 0 HOSTLIST_ID = 0
HOSTLIST_NAME = 1 HOSTLIST_NAME = 1
@ -364,7 +364,7 @@ class WebApi(JSONComponent):
d = Deferred() d = Deferred()
log.info("Updating ui with keys '%r' and filters '%r'", keys, log.info("Updating ui with keys '%r' and filters '%r'", keys,
filter_dict) filter_dict)
def got_stats(stats): def got_stats(stats):
ui_info["stats"] = stats ui_info["stats"] = stats
@ -388,7 +388,7 @@ class WebApi(JSONComponent):
d3.addCallback(got_stats) d3.addCallback(got_stats)
dl = DeferredList([d1, d2, d3], consumeErrors=True) dl = DeferredList([d1, d2, d3], consumeErrors=True)
dl.addCallback(on_complete) dl.addCallback(on_complete)
return d return d
def _on_got_files(self, torrent, d): def _on_got_files(self, torrent, d):
@ -410,7 +410,7 @@ class WebApi(JSONComponent):
if type(item) is dict: if type(item) is dict:
return item return item
return [info[path]["index"], info[path]["size"], return [info[path]["index"], info[path]["size"],
info[path]["progress"], info[path]["priority"]] info[path]["progress"], info[path]["priority"]]
file_tree = uicommon.FileTree(paths) file_tree = uicommon.FileTree(paths)
file_tree.walk(walk) file_tree.walk(walk)
@ -488,7 +488,7 @@ class WebApi(JSONComponent):
filename = os.path.basename(torrent["path"]) filename = os.path.basename(torrent["path"])
fdump = base64.encodestring(open(torrent["path"], "rb").read()) fdump = base64.encodestring(open(torrent["path"], "rb").read())
log.info("Adding torrent from file `%s` with options `%r`", log.info("Adding torrent from file `%s` with options `%r`",
filename, torrent["options"]) filename, torrent["options"])
client.core.add_torrent_file(filename, fdump, torrent["options"]) client.core.add_torrent_file(filename, fdump, torrent["options"])
d = Deferred() d = Deferred()
d.callback(True) d.callback(True)
@ -500,23 +500,23 @@ class WebApi(JSONComponent):
Return the hosts in the hostlist. Return the hosts in the hostlist.
""" """
log.debug("get_hosts called") log.debug("get_hosts called")
d = Deferred() d = Deferred()
d.callback([(tuple(host[HOSTS_ID:HOSTS_PORT+1]) + (_("Offline"),)) for host in self.host_list["hosts"]]) d.callback([(tuple(host[HOSTS_ID:HOSTS_PORT+1]) + (_("Offline"),)) for host in self.host_list["hosts"]])
return d return d
@export @export
def get_host_status(self, host_id): def get_host_status(self, host_id):
""" """
Returns the current status for the specified host. Returns the current status for the specified host.
""" """
main_deferred = Deferred() main_deferred = Deferred()
(host_id, host, port, user, password) = self.get_host(host_id) (host_id, host, port, user, password) = self.get_host(host_id)
def callback(status, info=None): def callback(status, info=None):
main_deferred.callback((host_id, host, port, status, info)) main_deferred.callback((host_id, host, port, status, info))
def on_connect(connected, c, host_id): def on_connect(connected, c, host_id):
def on_info(info, c): def on_info(info, c):
c.disconnect() c.disconnect()
callback(_("Online"), info) callback(_("Online"), info)
@ -536,8 +536,8 @@ class WebApi(JSONComponent):
callback(_("Offline")) callback(_("Offline"))
if client.connected() and (host, port, "localclient" if not \ if client.connected() and (host, port, "localclient" if not \
user and host in ("127.0.0.1", "localhost") else \ user and host in ("127.0.0.1", "localhost") else \
user) == client.connection_info(): user) == client.connection_info():
def on_info(info): def on_info(info):
callback(_("Connected"), info) callback(_("Connected"), info)
@ -610,7 +610,7 @@ class WebApi(JSONComponent):
# Host isn't in the list, so lets add it # Host isn't in the list, so lets add it
connection_id = hashlib.sha1(str(time.time())).hexdigest() connection_id = hashlib.sha1(str(time.time())).hexdigest()
self.host_list["hosts"].append([connection_id, host, port, username, self.host_list["hosts"].append([connection_id, host, port, username,
password]) password])
self.host_list.save() self.host_list.save()
d.callback((True,)) d.callback((True,))
return d return d