summaryrefslogtreecommitdiffstats
path: root/deluge/ui/sessionproxy.py
diff options
context:
space:
mode:
authorChase Sterling <chase.sterling@gmail.com>2013-02-10 17:30:25 -0500
committerChase Sterling <chase.sterling@gmail.com>2013-02-10 17:30:25 -0500
commit8c106ce8c4c0794ddd63e8e8f98b097221a56a52 (patch)
tree45944ea2333b4da97045ccefed2ed5e1de3ac321 /deluge/ui/sessionproxy.py
parentb4f5e78a775503a5501e2eba7eee73dfa0e1955a (diff)
parentfbdda1b3a5db6203f1993a03eed92ca489903aab (diff)
downloaddeluge-8c106ce8c4c0794ddd63e8e8f98b097221a56a52.tar.gz
deluge-8c106ce8c4c0794ddd63e8e8f98b097221a56a52.tar.bz2
deluge-8c106ce8c4c0794ddd63e8e8f98b097221a56a52.zip
Merge remote-tracking branch 'bro/master-daemon-optimize-speed'
Conflicts: deluge/core/alertmanager.py deluge/core/torrentmanager.py
Diffstat (limited to 'deluge/ui/sessionproxy.py')
-rw-r--r--deluge/ui/sessionproxy.py18
1 files changed, 2 insertions, 16 deletions
diff --git a/deluge/ui/sessionproxy.py b/deluge/ui/sessionproxy.py
index b7acd890f..0b5234704 100644
--- a/deluge/ui/sessionproxy.py
+++ b/deluge/ui/sessionproxy.py
@@ -47,10 +47,8 @@ class SessionProxy(component.Component):
The SessionProxy component is used to cache session information client-side
to reduce the number of RPCs needed to provide a rich user interface.
- On start-up it will query the Core for a full status of all the torrents in
- the session. After that point, it will query the Core for only changes in
- the status of the torrents and will try to satisfy client requests from the
- cache.
+ It will query the Core for only changes in the status of the torrents
+ and will try to satisfy client requests from the cache.
"""
def __init__(self):
@@ -78,18 +76,6 @@ class SessionProxy(component.Component):
# so that upcoming queries or status updates don't throw errors.
self.torrents.setdefault(torrent_id, [time.time(), {}])
self.cache_times.setdefault(torrent_id, {})
- # These initial keys are the ones used for the visible columns(by
- # default) on the GTK UI torrent view. If either the console-ui
- # or the web-ui needs additional keys, add them here;
- # There's NO need to fetch every bit of status information from
- # core if it's not going to be used. Additional status fields
- # will be queried later, for example, when viewing the status tab
- # of a torrent.
- inital_keys = [
- 'queue', 'state', 'name', 'total_wanted', 'progress', 'state',
- 'download_payload_rate', 'upload_payload_rate', 'eta', 'owner'
- ]
- self.get_torrents_status({'id': torrent_ids}, inital_keys)
return client.core.get_session_state().addCallback(on_get_session_state)
def stop(self):