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

Fixed ETA display issue when it doesn't fit to python's int and become long.

Browse Source
This commit is contained in:
Alex Dedul 2007-07-15 06:51:03 +00:00
parent 9d68f5f494
commit 5a103a4e35
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common.py
View File

@ -59,6 +59,7 @@ def estimate_eta(state):
return _("Infinity") return _("Infinity")
def get_eta(size, done, speed): def get_eta(size, done, speed):
# raise ZeroDivisionError for Infinity in estimate_eta()
if (size - done) == 0: if (size - done) == 0:
raise ZeroDivisionError raise ZeroDivisionError
return (size - done) / speed return (size - done) / speed

6
src/interface.py
View File

@ -413,7 +413,7 @@ class DelugeGTK:
# DL, UL, ETA, Share # DL, UL, ETA, Share
self.torrent_model = gtk.ListStore(int, gobject.TYPE_UINT, self.torrent_model = gtk.ListStore(int, gobject.TYPE_UINT,
gtk.gdk.Pixbuf, str, gobject.TYPE_UINT64, float, str, int, int, gtk.gdk.Pixbuf, str, gobject.TYPE_UINT64, float, str, int, int,
int, int, int, int, gobject.TYPE_UINT, float) int, int, int, int, gobject.TYPE_UINT64, float)
# Stores unique_ID -> gtk.TreeRowReference's mapping for quick look up # Stores unique_ID -> gtk.TreeRowReference's mapping for quick look up
self.torrent_model_dict = {} self.torrent_model_dict = {}
@ -805,7 +805,7 @@ class DelugeGTK:
dl_speed = int(state['download_rate']) dl_speed = int(state['download_rate'])
ul_speed = int(state['upload_rate']) ul_speed = int(state['upload_rate'])
try: try:
eta = common.get_eta(state["total_wanted"], state["total_wanted_done"], state["download_rate"]) eta = common.get_eta(size, state["total_wanted_done"], dl_speed)
except ZeroDivisionError: except ZeroDivisionError:
eta = 0 eta = 0
share = float(self.calc_share_ratio(unique_id, state)) share = float(self.calc_share_ratio(unique_id, state))
@ -819,7 +819,7 @@ class DelugeGTK:
status_icon = gtk.gdk.pixbuf_new_from_file(common.get_pixmap("downloading16.png")) status_icon = gtk.gdk.pixbuf_new_from_file(common.get_pixmap("downloading16.png"))
rlist = [int(unique_id), queue, status_icon, name, size, progress, message, rlist = [int(unique_id), queue, status_icon, name, size, progress, message,
seeds, seeds_t, peers, peers_t, dl_speed, ul_speed, int(eta), share] seeds, seeds_t, peers, peers_t, dl_speed, ul_speed, eta, share]
return rlist return rlist