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

Show paused state correctly in TorrentView.

This commit is contained in:
Andrew Resch 2007-09-21 23:30:03 +00:00
parent f7b537ad81
commit 007f8c8dc3
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deluge/common.py
View File

@ -47,7 +47,8 @@ TORRENT_STATE = [
"Downloading", "Downloading",
"Finished", "Finished",
"Seeding", "Seeding",
"Allocating" "Allocating",
"Paused"
] ]
def get_version(): def get_version():

9
deluge/core/torrent.py
View File

@ -33,6 +33,8 @@
"""Internal Torrent class""" """Internal Torrent class"""
import deluge.common
class Torrent: class Torrent:
"""Torrent holds information about torrents added to the libtorrent session. """Torrent holds information about torrents added to the libtorrent session.
""" """
@ -102,6 +104,11 @@ class Torrent:
else: else:
total_peers = status.num_incomplete total_peers = status.num_incomplete
# Set the state to 'Paused' if the torrent is paused.
state = status.state
if status.paused:
state = deluge.common.TORRENT_STATE.index("Paused")
full_status = { full_status = {
"name": self.handle.torrent_info().name(), "name": self.handle.torrent_info().name(),
"total_size": self.handle.torrent_info().total_size(), "total_size": self.handle.torrent_info().total_size(),
@ -111,7 +118,7 @@ class Torrent:
"distributed_copies": status.distributed_copies, "distributed_copies": status.distributed_copies,
"total_done": status.total_done, "total_done": status.total_done,
"total_uploaded": self.total_uploaded + status.total_payload_upload, "total_uploaded": self.total_uploaded + status.total_payload_upload,
"state": int(status.state), "state": int(state),
"paused": status.paused, "paused": status.paused,
"progress": progress, "progress": progress,
"next_announce": status.next_announce.seconds, "next_announce": status.next_announce.seconds,

7
deluge/ui/gtkui/torrentview.py
View File

@ -54,6 +54,8 @@ def cell_data_statusicon(column, cell, model, row, data):
fname = "downloading16.png" fname = "downloading16.png"
if state == deluge.common.TORRENT_STATE.index("Queued"): if state == deluge.common.TORRENT_STATE.index("Queued"):
fname = "inactive16.png" fname = "inactive16.png"
if state == deluge.common.TORRENT_STATE.index("Paused"):
fname = "inactive16.png"
if state == deluge.common.TORRENT_STATE.index("Checking"): if state == deluge.common.TORRENT_STATE.index("Checking"):
fname = "downloading16.png" fname = "downloading16.png"
if state == deluge.common.TORRENT_STATE.index("Allocating"): if state == deluge.common.TORRENT_STATE.index("Allocating"):
@ -72,11 +74,12 @@ def cell_data_progress(column, cell, model, row, data):
value = model.get_value(row, column1) value = model.get_value(row, column1)
text = model.get_value(row, column2) text = model.get_value(row, column2)
cell.set_property("value", value) cell.set_property("value", value)
textstr = "%s" % _(deluge.common.TORRENT_STATE[text]) textstr = "%s" % deluge.common.TORRENT_STATE[text]
if deluge.common.TORRENT_STATE[text] == "Downloading" or\ if deluge.common.TORRENT_STATE[text] == "Downloading" or\
deluge.common.TORRENT_STATE[text] == "Downloading Metadata" or\ deluge.common.TORRENT_STATE[text] == "Downloading Metadata" or\
deluge.common.TORRENT_STATE[text] == "Checking" or\ deluge.common.TORRENT_STATE[text] == "Checking" or\
deluge.common.TORRENT_STATE[text] == "Allocating": deluge.common.TORRENT_STATE[text] == "Allocating" or\
(deluge.common.TORRENT_STATE[text] == "Paused" and value < 100):
textstr = textstr + " %.2f%%" % value textstr = textstr + " %.2f%%" % value
cell.set_property("text", textstr) cell.set_property("text", textstr)