5cd86aa5bc
* Implemented torrent updates with libtorrent post_torrent_updates. This required some changes to how core/torrenthandler handles get_torrent_status * Reworked how torrent.py handles torrent info * Removed some unneeded RPC message requests from client. * Added tests for some expensive log prints.
282 lines
11 KiB
Python
282 lines
11 KiB
Python
#
|
|
# sessionproxy.py
|
|
#
|
|
# Copyright (C) 2010 Andrew Resch <andrewresch@gmail.com>
|
|
#
|
|
# Deluge is free software.
|
|
#
|
|
# You may redistribute it and/or modify it under the terms of the
|
|
# GNU General Public License, as published by the Free Software
|
|
# Foundation; either version 3 of the License, or (at your option)
|
|
# any later version.
|
|
#
|
|
# deluge is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
# See the GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with deluge. If not, write to:
|
|
# The Free Software Foundation, Inc.,
|
|
# 51 Franklin Street, Fifth Floor
|
|
# Boston, MA 02110-1301, USA.
|
|
#
|
|
# In addition, as a special exception, the copyright holders give
|
|
# permission to link the code of portions of this program with the OpenSSL
|
|
# library.
|
|
# You must obey the GNU General Public License in all respects for all of
|
|
# the code used other than OpenSSL. If you modify file(s) with this
|
|
# exception, you may extend this exception to your version of the file(s),
|
|
# but you are not obligated to do so. If you do not wish to do so, delete
|
|
# this exception statement from your version. If you delete this exception
|
|
# statement from all source files in the program, then also delete it here.
|
|
#
|
|
#
|
|
|
|
import logging
|
|
from twisted.internet.defer import maybeDeferred, succeed
|
|
|
|
import deluge.component as component
|
|
from deluge.ui.client import client
|
|
import time
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
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.
|
|
|
|
"""
|
|
def __init__(self):
|
|
log.debug("SessionProxy init..")
|
|
component.Component.__init__(self, "SessionProxy", interval=5)
|
|
|
|
# Set the cache time in seconds
|
|
# This is how long data will be valid before re-fetching from the core
|
|
self.cache_time = 1.5
|
|
|
|
# Hold the torrents' status.. {torrent_id: [time, {status_dict}], ...}
|
|
self.torrents = {}
|
|
|
|
# Holds the time of the last key update.. {torrent_id: {key1, time, ...}, ...}
|
|
self.cache_times = {}
|
|
|
|
client.register_event_handler("TorrentStateChangedEvent", self.on_torrent_state_changed)
|
|
client.register_event_handler("TorrentRemovedEvent", self.on_torrent_removed)
|
|
client.register_event_handler("TorrentAddedEvent", self.on_torrent_added)
|
|
|
|
def start(self):
|
|
def on_get_session_state(torrent_ids):
|
|
for torrent_id in torrent_ids:
|
|
# Let's at least store the torrent ids with empty statuses
|
|
# 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'
|
|
#]
|
|
|
|
#The the torrents status will be requested by torrentview, so this
|
|
#only causes a second request for the same data withing a few miliseconds
|
|
#self.get_torrents_status({'id': torrent_ids}, inital_keys)
|
|
return client.core.get_session_state().addCallback(on_get_session_state)
|
|
|
|
def stop(self):
|
|
client.deregister_event_handler("TorrentStateChangedEvent", self.on_torrent_state_changed)
|
|
client.deregister_event_handler("TorrentRemovedEvent", self.on_torrent_removed)
|
|
client.deregister_event_handler("TorrentAddedEvent", self.on_torrent_added)
|
|
self.torrents = {}
|
|
|
|
def create_status_dict(self, torrent_ids, keys):
|
|
"""
|
|
Creates a status dict from the cache.
|
|
|
|
:param torrent_ids: the torrent_ids
|
|
:type torrent_ids: list of strings
|
|
:param keys: the status keys
|
|
:type keys: list of strings
|
|
|
|
:returns: a dict with the status information for the *torrent_ids*
|
|
:rtype: dict
|
|
|
|
"""
|
|
sd = {}
|
|
for torrent_id in torrent_ids:
|
|
try:
|
|
if keys:
|
|
sd[torrent_id] = dict([
|
|
(x, y) for x, y in self.torrents[torrent_id][1].iteritems()
|
|
if x in keys
|
|
])
|
|
else:
|
|
sd[torrent_id] = dict(self.torrents[torrent_id][1])
|
|
except KeyError:
|
|
continue
|
|
|
|
return sd
|
|
|
|
def get_torrent_status(self, torrent_id, keys):
|
|
"""
|
|
Get a status dict for one torrent.
|
|
|
|
:param torrent_id: the torrent_id
|
|
:type torrent_id: string
|
|
:param keys: the status keys
|
|
:type keys: list of strings
|
|
|
|
:returns: a dict of status information
|
|
:rtype: dict
|
|
|
|
"""
|
|
if torrent_id in self.torrents:
|
|
# Keep track of keys we need to request from the core
|
|
keys_to_get = []
|
|
if not keys:
|
|
keys = self.torrents[torrent_id][1].keys()
|
|
|
|
for key in keys:
|
|
if time.time() - self.cache_times[torrent_id].get(key, 0.0) > self.cache_time:
|
|
keys_to_get.append(key)
|
|
|
|
if not keys_to_get:
|
|
return succeed(
|
|
self.create_status_dict([torrent_id], keys)[torrent_id]
|
|
)
|
|
else:
|
|
d = client.core.get_torrent_status(torrent_id, keys_to_get, True)
|
|
def on_status(result, torrent_id):
|
|
t = time.time()
|
|
self.torrents[torrent_id][0] = t
|
|
self.torrents[torrent_id][1].update(result)
|
|
for key in keys_to_get:
|
|
self.cache_times[torrent_id][key] = t
|
|
return self.create_status_dict([torrent_id], keys)[torrent_id]
|
|
return d.addCallback(on_status, torrent_id)
|
|
else:
|
|
d = client.core.get_torrent_status(torrent_id, keys, True)
|
|
def on_status(result):
|
|
if result:
|
|
t = time.time()
|
|
self.torrents[torrent_id] = (t, result)
|
|
self.cache_times[torrent_id] = {}
|
|
for key in result:
|
|
self.cache_times[torrent_id][key] = t
|
|
|
|
return result
|
|
return d.addCallback(on_status)
|
|
|
|
def get_torrents_status(self, filter_dict, keys):
|
|
"""
|
|
Get a dict of torrent statuses.
|
|
|
|
The filter can take 2 keys, *state* and *id*. The state filter can be
|
|
one of the torrent states or the special one *Active*. The *id* key is
|
|
simply a list of torrent_ids.
|
|
|
|
:param filter_dict: the filter used for this query
|
|
:type filter_dict: dict
|
|
:param keys: the status keys
|
|
:type keys: list of strings
|
|
|
|
:returns: a dict of torrent_ids and their status dicts
|
|
:rtype: dict
|
|
|
|
"""
|
|
# Helper functions and callbacks ---------------------------------------
|
|
def on_status(result, torrent_ids, keys):
|
|
# Update the internal torrent status dict with the update values
|
|
t = time.time()
|
|
for key, value in result.items():
|
|
try:
|
|
self.torrents[key][0] = t
|
|
self.torrents[key][1].update(value)
|
|
for k in value:
|
|
self.cache_times[key][k] = t
|
|
except KeyError:
|
|
#The torrent was removed
|
|
continue
|
|
|
|
# Create the status dict
|
|
if not torrent_ids:
|
|
torrent_ids = result.keys()
|
|
|
|
return self.create_status_dict(torrent_ids, keys)
|
|
|
|
def find_torrents_to_fetch(torrent_ids):
|
|
to_fetch = []
|
|
t = time.time()
|
|
for torrent_id in torrent_ids:
|
|
torrent = self.torrents[torrent_id]
|
|
if t - torrent[0] > self.cache_time:
|
|
to_fetch.append(torrent_id)
|
|
else:
|
|
# We need to check if a key is expired
|
|
for key in keys:
|
|
if t - self.cache_times[torrent_id].get(key, 0.0) > self.cache_time:
|
|
to_fetch.append(torrent_id)
|
|
break
|
|
|
|
return to_fetch
|
|
#-----------------------------------------------------------------------
|
|
|
|
if not filter_dict:
|
|
# This means we want all the torrents status
|
|
# We get a list of any torrent_ids with expired status dicts
|
|
to_fetch = find_torrents_to_fetch(self.torrents.keys())
|
|
if to_fetch:
|
|
d = client.core.get_torrents_status({"id": to_fetch}, keys, True)
|
|
return d.addCallback(on_status, self.torrents.keys(), keys)
|
|
|
|
# Don't need to fetch anything
|
|
return maybeDeferred(self.create_status_dict, self.torrents.keys(), keys)
|
|
|
|
|
|
if len(filter_dict) == 1 and "id" in filter_dict:
|
|
# At this point we should have a filter with just "id" in it
|
|
to_fetch = find_torrents_to_fetch(filter_dict["id"])
|
|
if to_fetch:
|
|
d = client.core.get_torrents_status({"id": to_fetch}, keys, True)
|
|
return d.addCallback(on_status, filter_dict["id"], keys)
|
|
else:
|
|
# Don't need to fetch anything, so just return data from the cache
|
|
return maybeDeferred(self.create_status_dict, filter_dict["id"], keys)
|
|
else:
|
|
# This is a keyworded filter so lets just pass it onto the core
|
|
# XXX: Add more caching here.
|
|
d = client.core.get_torrents_status(filter_dict, keys, True)
|
|
return d.addCallback(on_status, None, keys)
|
|
|
|
def on_torrent_state_changed(self, torrent_id, state):
|
|
if torrent_id in self.torrents:
|
|
self.torrents[torrent_id][1].setdefault("state", state)
|
|
self.cache_times.setdefault(torrent_id, {}).update(state=time.time())
|
|
|
|
def on_torrent_added(self, torrent_id, from_state):
|
|
self.torrents[torrent_id] = [time.time() - self.cache_time - 1, {}]
|
|
self.cache_times[torrent_id] = {}
|
|
def on_status(status):
|
|
self.torrents[torrent_id][1].update(status)
|
|
t = time.time()
|
|
for key in status:
|
|
self.cache_times[torrent_id][key] = t
|
|
client.core.get_torrent_status(torrent_id, []).addCallback(on_status)
|
|
|
|
def on_torrent_removed(self, torrent_id):
|
|
if torrent_id in self.torrents:
|
|
del self.torrents[torrent_id]
|
|
del self.cache_times[torrent_id]
|