From cb19d71b7d56f8e6c09973bad118bbad6146ca0e Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Thu, 23 Oct 2008 16:52:09 +0000 Subject: [PATCH] Fix #545 use proper values in ratio calculation --- deluge/core/torrent.py | 7 +++-- deluge/ui/gtkui/statistics_tab.py | 48 +++++++++++++++---------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index d3bad5f00..115bd4f43 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -410,8 +410,8 @@ class Torrent: else: status = self.status - up = self.total_uploaded + status.total_payload_upload - down = status.total_done + up = status.all_time_upload + down = status.all_time_download # Convert 'up' and 'down' to floats for proper calculation up = float(up) @@ -538,11 +538,12 @@ class Torrent: "distributed_copies": distributed_copies, "total_done": self.status.total_done, "total_uploaded": self.status.all_time_upload, + "all_time_download": self.status.all_time_download, "state": self.state, "paused": self.status.paused, "progress": progress, "next_announce": self.status.next_announce.seconds, - "total_payload_download": self.status.all_time_download, + "total_payload_download": self.status.total_payload_download, "total_payload_upload": self.status.total_payload_upload, "download_payload_rate": self.status.download_payload_rate, "upload_payload_rate": self.status.upload_payload_rate, diff --git a/deluge/ui/gtkui/statistics_tab.py b/deluge/ui/gtkui/statistics_tab.py index 11fb40a74..94a7da108 100644 --- a/deluge/ui/gtkui/statistics_tab.py +++ b/deluge/ui/gtkui/statistics_tab.py @@ -2,19 +2,19 @@ # statistics_tab.py # # Copyright (C) 2008 Andrew Resch ('andar') -# +# # 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., @@ -50,20 +50,20 @@ def fratio(value): def fpcnt(value): return "%.2f%%" % value - + def fspeed(value, max_value=-1): if max_value > -1: return "%s [%s KiB/s]" % (deluge.common.fspeed(value), max_value) else: return deluge.common.fspeed(value) - + class StatisticsTab(Tab): def __init__(self): Tab.__init__(self) # Get the labels we need to update. # widgetname, modifier function, status keys glade = component.get("MainWindow").main_glade - + self._name = "Statistics" self._child_widget = glade.get_widget("statistics_tab") self._tab_label = glade.get_widget("statistics_tab_label") @@ -71,7 +71,7 @@ class StatisticsTab(Tab): self.label_widgets = [ (glade.get_widget("summary_pieces"), fpeer_size_second, ("num_pieces", "piece_length")), (glade.get_widget("summary_availability"), fratio, ("distributed_copies",)), - (glade.get_widget("summary_total_downloaded"), fpeer_sized, ("total_done", "total_payload_download")), + (glade.get_widget("summary_total_downloaded"), fpeer_sized, ("all_time_download", "total_payload_download")), (glade.get_widget("summary_total_uploaded"), fpeer_sized, ("total_uploaded", "total_payload_upload")), (glade.get_widget("summary_download_speed"), fspeed, ("download_payload_rate", "max_download_speed")), (glade.get_widget("summary_upload_speed"), fspeed, ("upload_payload_rate", "max_upload_speed")), @@ -87,37 +87,37 @@ class StatisticsTab(Tab): (glade.get_widget("summary_auto_managed"), str, ("is_auto_managed",)), (glade.get_widget("progressbar"), fpcnt, ("progress",)) ] - + def update(self): # Get the first selected torrent selected = component.get("TorrentView").get_selected_torrents() - + # Only use the first torrent in the list or return if None selected if len(selected) != 0: selected = selected[0] else: # No torrent is selected in the torrentview return - + # Get the torrent status - status_keys = ["progress", "num_pieces", "piece_length", - "distributed_copies", "total_done", "total_payload_download", - "total_uploaded", "total_payload_upload", "download_payload_rate", + status_keys = ["progress", "num_pieces", "piece_length", + "distributed_copies", "all_time_download", "total_payload_download", + "total_uploaded", "total_payload_upload", "download_payload_rate", "upload_payload_rate", "num_peers", "num_seeds", "total_peers", "total_seeds", "eta", "ratio", "next_announce", - "tracker_status", "max_connections", "max_upload_slots", - "max_upload_speed", "max_download_speed", "active_time", + "tracker_status", "max_connections", "max_upload_slots", + "max_upload_speed", "max_download_speed", "active_time", "seeding_time", "seed_rank", "is_auto_managed"] - + client.get_torrent_status( self._on_get_torrent_status, selected, status_keys) - + def _on_get_torrent_status(self, status): # Check to see if we got valid data from the core if status is None: return - - # Update all the label widgets + + # Update all the label widgets for widget in self.label_widgets: if widget[1] != None: args = [] @@ -127,22 +127,22 @@ class StatisticsTab(Tab): except Exception, e: log.debug("Unable to get status value: %s", e) continue - + txt = widget[1](*args) else: txt = status[widget[2][0]] if widget[0].get_text() != txt: widget[0].set_text(txt) - + # Do the progress bar because it's a special case (not a label) w = component.get("MainWindow").main_glade.get_widget("progressbar") fraction = status["progress"] / 100 if w.get_fraction() != fraction: w.set_fraction(fraction) - + def clear(self): for widget in self.label_widgets: widget[0].set_text("") - + component.get("MainWindow").main_glade.get_widget("progressbar").set_fraction(0.0)