codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimize torrent.get_status() a bit. 

Emit signals with gobject.idle_add().
This commit is contained in:
Andrew Resch 2007-12-27 10:54:05 +00:00
parent 58a240a998
commit 91c55522b8
2 changed files with 67 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deluge/core/signalmanager.py
View File

@ -33,6 +33,8 @@
import xmlrpclib import xmlrpclib
import gobject
import deluge.component as component import deluge.component as component
from deluge.log import LOG as log from deluge.log import LOG as log
@ -60,8 +62,11 @@ class SignalManager(component.Component):
def emit(self, signal, data): def emit(self, signal, data):
for client in self.clients.values(): for client in self.clients.values():
try: gobject.idle_add(self._emit, client, signal, data)
client.emit_signal(signal, data)
except: def _emit(self, client, signal, data):
log.warning("Unable to emit signal to client %s", client) try:
client.emit_signal(signal, data)
except:
log.warning("Unable to emit signal to client %s", client)

86
deluge/core/torrent.py
View File

@ -66,6 +66,10 @@ class Torrent:
else: else:
self.trackers = trackers self.trackers = trackers
# Holds status info so that we don't need to keep getting it from lt
self.status = None
self.torrent_info = None
def set_tracker_status(self, status): def set_tracker_status(self, status):
"""Sets the tracker status""" """Sets the tracker status"""
self.tracker_status = status self.tracker_status = status
@ -79,14 +83,18 @@ class Torrent:
def get_eta(self): def get_eta(self):
"""Returns the ETA in seconds for this torrent""" """Returns the ETA in seconds for this torrent"""
left = self.handle.status().total_wanted \ if self.status == None:
- self.handle.status().total_done status = self.handle.status()
else:
status = self.status
if left == 0 or self.handle.status().download_payload_rate == 0: left = status.total_wanted - status.total_done
if left == 0 or status.download_payload_rate == 0:
return 0 return 0
try: try:
eta = left / self.handle.status().download_payload_rate eta = left / status.download_payload_rate
except ZeroDivisionError: except ZeroDivisionError:
eta = 0 eta = 0
@ -94,8 +102,13 @@ class Torrent:
def get_ratio(self): def get_ratio(self):
"""Returns the ratio for this torrent""" """Returns the ratio for this torrent"""
up = self.total_uploaded + self.handle.status().total_payload_upload if self.status == None:
down = self.handle.status().total_done status = self.handle.status()
else:
status = self.status
up = self.total_uploaded + status.total_payload_upload
down = status.total_done
# Convert 'up' and 'down' to floats for proper calculation # Convert 'up' and 'down' to floats for proper calculation
up = float(up) up = float(up)
@ -110,8 +123,13 @@ class Torrent:
def get_files(self): def get_files(self):
"""Returns a list of files this torrent contains""" """Returns a list of files this torrent contains"""
if self.torrent_info == None:
torrent_info = self.handle.torrent_info()
else:
torrent_info = self.torrent_info
ret = [] ret = []
files = self.handle.torrent_info().files() files = torrent_info.files()
for file in files: for file in files:
ret.append({ ret.append({
'path': file.path, 'path': file.path,
@ -120,57 +138,61 @@ class Torrent:
}) })
return ret return ret
@tit
def get_status(self, keys): def get_status(self, keys):
"""Returns the status of the torrent based on the keys provided""" """Returns the status of the torrent based on the keys provided"""
# Create the full dictionary # Create the full dictionary
status = self.handle.status() self.status = self.handle.status()
self.torrent_info = self.handle.torrent_info()
# Adjust progress to be 0-100 value # Adjust progress to be 0-100 value
progress = status.progress*100 progress = self.status.progress * 100
# Set the state to 'Paused' if the torrent is paused. # Set the state to 'Paused' if the torrent is paused.
state = status.state state = self.status.state
if status.paused: if self.status.paused:
state = deluge.common.TORRENT_STATE.index("Paused") state = deluge.common.TORRENT_STATE.index("Paused")
# Adjust status.distributed_copies to return a non-negative value # Adjust status.distributed_copies to return a non-negative value
distributed_copies = status.distributed_copies distributed_copies = self.status.distributed_copies
if distributed_copies < 0: if distributed_copies < 0:
distributed_copies = 0.0 distributed_copies = 0.0
full_status = { full_status = {
"name": self.handle.torrent_info().name(), "name": self.torrent_info.name(),
"total_size": self.handle.torrent_info().total_size(), "total_size": self.torrent_info.total_size(),
"num_files": self.handle.torrent_info().num_files(), "num_files": self.torrent_info.num_files(),
"num_pieces": self.handle.torrent_info().num_pieces(), "num_pieces": self.torrent_info.num_pieces(),
"piece_length": self.handle.torrent_info().piece_length(), "piece_length": self.torrent_info.piece_length(),
"distributed_copies": distributed_copies, "distributed_copies": distributed_copies,
"total_done": status.total_done, "total_done": self.status.total_done,
"total_uploaded": self.total_uploaded + status.total_payload_upload, "total_uploaded": self.total_uploaded + self.status.total_payload_upload,
"state": int(state), "state": int(state),
"paused": status.paused, "paused": self.status.paused,
"progress": progress, "progress": progress,
"next_announce": status.next_announce.seconds, "next_announce": self.status.next_announce.seconds,
"total_payload_download": status.total_payload_download, "total_payload_download": self.status.total_payload_download,
"total_payload_upload": status.total_payload_upload, "total_payload_upload": self.status.total_payload_upload,
"download_payload_rate": status.download_payload_rate, "download_payload_rate": self.status.download_payload_rate,
"upload_payload_rate": status.upload_payload_rate, "upload_payload_rate": self.status.upload_payload_rate,
"num_peers": status.num_peers - status.num_seeds, "num_peers": self.status.num_peers - self.status.num_seeds,
"num_seeds": status.num_seeds, "num_seeds": self.status.num_seeds,
"total_peers": status.num_incomplete, "total_peers": self.status.num_incomplete,
"total_seeds": status.num_complete, "total_seeds": self.status.num_complete,
"total_wanted": status.total_wanted, "total_wanted": self.status.total_wanted,
"eta": self.get_eta(), "eta": self.get_eta(),
"ratio": self.get_ratio(), "ratio": self.get_ratio(),
"tracker": status.current_tracker, "tracker": self.status.current_tracker,
"trackers": self.trackers, "trackers": self.trackers,
"tracker_status": self.tracker_status, "tracker_status": self.tracker_status,
"save_path": self.save_path, "save_path": self.save_path,
"files": self.get_files() "files": self.get_files()
} }
self.status = None
self.torrent_info = None
# Create the desired status dictionary and return it # Create the desired status dictionary and return it
status_dict = {} status_dict = {}.fromkeys(keys)
if len(keys) == 0: if len(keys) == 0:
status_dict = full_status status_dict = full_status