codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-02-04 23:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Last seen complete

Browse Source 
Update last_seen_complete when a status is queried for and that key is on the keys to get or it's a full status query. Either way, only "calculate" last seen at a minimum of one time per 60 seconds(simple caching).
This commit is contained in:
Pedro Algarvio 2011-05-08 01:36:40 +01:00
parent 95d7caf3ac
commit 38906468c1
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deluge/core/torrent.py
View File

@ -564,6 +564,16 @@ class Torrent(object):
return host return host
return "" return ""
def get_last_seen_complete(self):
"""
Returns the time a torrent was last seen complete, ie, with all pieces
available.
"""
if lt.version_minor > 16:
return self.status.last_seen_complete
self.calculate_last_seen_complete()
return self._last_seen_complete
def get_status(self, keys, diff=False): def get_status(self, keys, diff=False):
""" """
Returns the status of the torrent based on the keys provided Returns the status of the torrent based on the keys provided
@ -639,10 +649,6 @@ class Torrent(object):
"tracker_status": self.tracker_status, "tracker_status": self.tracker_status,
"upload_payload_rate": self.status.upload_payload_rate "upload_payload_rate": self.status.upload_payload_rate
} }
if lt.version_minor > 16:
full_status["last_seen_complete"] = self.status.last_seen_complete
else:
full_status["last_seen_complete"] = self._last_seen_complete
def ti_comment(): def ti_comment():
if self.handle.has_metadata(): if self.handle.has_metadata():
@ -715,6 +721,7 @@ class Torrent(object):
"ratio": self.get_ratio, "ratio": self.get_ratio,
"total_size": ti_total_size, "total_size": ti_total_size,
"tracker_host": self.get_tracker_host, "tracker_host": self.get_tracker_host,
"last_seen_complete": self.get_last_seen_complete
} }
# Create the desired status dictionary and return it # Create the desired status dictionary and return it
@ -946,8 +953,11 @@ class Torrent(object):
if not self.rpcserver.is_session_valid(key): if not self.rpcserver.is_session_valid(key):
del self.prev_status[key] del self.prev_status[key]
# XXX: Remove when libtorrent 0.16 get's released???
def calculate_last_seen_complete(self): def calculate_last_seen_complete(self):
if self._last_seen_complete+60 > time.time():
# Simple caching. Only calculate every 1 min at minimum
return self._last_seen_complete
availability = self.handle.piece_availability() availability = self.handle.piece_availability()
if filter(lambda x: x<1, availability): if filter(lambda x: x<1, availability):
# Torrent does not have all the pieces # Torrent does not have all the pieces

3
deluge/core/torrentmanager.py
View File

@ -130,7 +130,8 @@ class TorrentManager(component.Component):
""" """
def __init__(self): def __init__(self):
component.Component.__init__(self, "TorrentManager", interval=5, depend=["CorePluginManager"]) component.Component.__init__(self, "TorrentManager", interval=5,
depend=["CorePluginManager"])
log.debug("TorrentManager init..") log.debug("TorrentManager init..")
# Set the libtorrent session # Set the libtorrent session
self.session = component.get("Core").session self.session = component.get("Core").session