mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-11 19:08:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the progress column from the peers tab.

Browse source 
Only show connected peers.
This commit is contained in:
Andrew Resch 2008-04-06 00:09:30 +00:00
commit c226014439
2 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
deluge/core/torrent.py
View file

@ -236,19 +236,16 @@ class Torrent:
peers = self.handle.get_peer_info() peers = self.handle.get_peer_info()
for peer in peers: for peer in peers:
# Find the progress # We do not want to report peers that are half-connected
num_pieces_complete = 0 if peer.flags & peer.connecting:
for piece in peer.pieces: continue
if piece:
num_pieces_complete += 1
progress = num_pieces_complete / len(peer.pieces) * 100
ret.append({ ret.append({
"ip": "%s:%s" % (peer.ip[0], peer.ip[1]), "ip": "%s:%s" % (peer.ip[0], peer.ip[1]),
"up_speed": peer.up_speed, "up_speed": peer.up_speed,
"down_speed": peer.down_speed, "down_speed": peer.down_speed,
"country": deluge.xmlrpclib.Binary(peer.country), "country": deluge.xmlrpclib.Binary(peer.country),
"client": deluge.xmlrpclib.Binary(peer.client), "client": deluge.xmlrpclib.Binary(peer.client),
"progress": progress
}) })
return ret return ret

26
deluge/ui/gtkui/peers_tab.py
View file

@ -58,7 +58,7 @@ class PeersTab:
glade = component.get("MainWindow").get_glade() glade = component.get("MainWindow").get_glade()
self.listview = glade.get_widget("peers_listview") self.listview = glade.get_widget("peers_listview")
# country, ip, client, progress, progress, downspeed, upspeed # country, ip, client, progress, progress, downspeed, upspeed
self.liststore = gtk.ListStore(str, str, str, str, int, int, int) self.liststore = gtk.ListStore(str, str, str, int, int)
# Country column # Country column
column = gtk.TreeViewColumn() column = gtk.TreeViewColumn()
@ -99,25 +99,11 @@ class PeersTab:
column.set_reorderable(True) column.set_reorderable(True)
self.listview.append_column(column) self.listview.append_column(column)
# Progress column
column = gtk.TreeViewColumn(_("Progress"))
render = gtk.CellRendererProgress()
column.pack_start(render)
column.add_attribute(render, "text", 3)
column.add_attribute(render, "value", 4)
column.set_sort_column_id(4)
column.set_clickable(True)
column.set_resizable(True)
column.set_expand(False)
column.set_min_width(10)
column.set_reorderable(True)
self.listview.append_column(column)
# Down Speed column # Down Speed column
column = gtk.TreeViewColumn(_("Down Speed")) column = gtk.TreeViewColumn(_("Down Speed"))
render = gtk.CellRendererText() render = gtk.CellRendererText()
column.pack_start(render, False) column.pack_start(render, False)
column.set_cell_data_func(render, cell_data_speed, 5) column.set_cell_data_func(render, cell_data_speed, 3)
column.set_sort_column_id(5) column.set_sort_column_id(5)
column.set_clickable(True) column.set_clickable(True)
column.set_resizable(True) column.set_resizable(True)
@ -130,7 +116,7 @@ class PeersTab:
column = gtk.TreeViewColumn(_("Up Speed")) column = gtk.TreeViewColumn(_("Up Speed"))
render = gtk.CellRendererText() render = gtk.CellRendererText()
column.pack_start(render, False) column.pack_start(render, False)
column.set_cell_data_func(render, cell_data_speed, 6) column.set_cell_data_func(render, cell_data_speed, 4)
column.set_sort_column_id(6) column.set_sort_column_id(6)
column.set_clickable(True) column.set_clickable(True)
column.set_resizable(True) column.set_resizable(True)
@ -180,6 +166,10 @@ class PeersTab:
if state == None: if state == None:
return return
if len(state) != self.listview.get_columns():
log.warning("peers_tab.state is not compatible! rejecting..")
return
for column_state in state: for column_state in state:
# Find matching columns in the listview # Find matching columns in the listview
for (index, column) in enumerate(self.listview.get_columns()): for (index, column) in enumerate(self.listview.get_columns()):
@ -223,8 +213,6 @@ class PeersTab:
peer["country"], peer["country"],
peer["ip"], peer["ip"],
peer["client"], peer["client"],
"%.2f%%" % peer["progress"],
peer["progress"],
peer["down_speed"], peer["down_speed"],
peer["up_speed"]]) peer["up_speed"]])