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

fixed up display of ETA to be more consistant

This commit is contained in:
Andrew Resch 2007-06-08 09:29:48 +00:00
parent c1d3d7ea81
commit f75dd27760
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common.py
View File

@ -39,12 +39,14 @@ PLUGIN_DIR = os.path.join(INSTALL_PREFIX, 'share', 'deluge', 'plugins')
def estimate_eta(state): def estimate_eta(state):
try: try:
return ftime(get_eta(state["total_size"], state["total_payload_download"], state["download_rate"])) return ftime(get_eta(state["total_size"], state["total_done"], state["download_rate"]))
except ZeroDivisionError: except ZeroDivisionError:
return _("Infinity") return _("Infinity")
def get_eta(size, done, rate): def get_eta(size, done, rate):
return long( (size - done) / rate ) if (size - done) == 0:
raise ZeroDivisionError
return (size - done) / rate
# Returns formatted string describing filesize # Returns formatted string describing filesize
# fsize_b should be in bytes # fsize_b should be in bytes

4
src/deluge_core.cpp
View File

@ -620,7 +620,7 @@ static PyObject *torrent_get_torrent_state(PyObject *self, PyObject *args)
long connected_peers = s.num_peers - connected_seeds; long connected_peers = s.num_peers - connected_seeds;
return Py_BuildValue("{s:s,s:l,s:l,s:l,s:l,s:f,s:f,s:i,s:f,s:i,s:l,s:s,s:s,s:f,s:i,s:i,s:l,s:l,s:l,s:d,s:l,s:l,s:l,s:l,s:l,s:l,s:i,s:d,s:d}", return Py_BuildValue("{s:s,s:l,s:l,s:l,s:l,s:f,s:f,s:i,s:f,s:i,s:l,s:s,s:s,s:f,s:i,s:i,s:l,s:l,s:l,s:i,s:l,s:l,s:l,s:l,s:l,s:l,s:i,s:d,s:d}",
"name", t.handle.get_torrent_info().name().c_str(), "name", t.handle.get_torrent_info().name().c_str(),
"num_files", t.handle.get_torrent_info().num_files(), "num_files", t.handle.get_torrent_info().num_files(),
"state", s.state, "state", s.state,
@ -640,7 +640,7 @@ static PyObject *torrent_get_torrent_state(PyObject *self, PyObject *args)
"pieces", long(s.pieces), "pieces", long(s.pieces),
"pieces_done", long(s.num_pieces), "pieces_done", long(s.num_pieces),
"block_size", long(s.block_size), "block_size", long(s.block_size),
"total_size", double(i.total_size()), "total_size", int(i.total_size()),
"piece_length", long(i.piece_length()), "piece_length", long(i.piece_length()),
"num_pieces", long(i.num_pieces()), "num_pieces", long(i.num_pieces()),
"total_peers", long(s.num_incomplete != -1? s.num_incomplete : connected_peers), "total_peers", long(s.num_incomplete != -1? s.num_incomplete : connected_peers),

8
src/interface.py
View File

@ -319,10 +319,8 @@ class DelugeGTK:
def time(column, cell, model, iter, data): def time(column, cell, model, iter, data):
time = int(model.get_value(iter, data)) time = int(model.get_value(iter, data))
if time < 0: if time < 0 or time == 0:
time_str = _("Infinity") time_str = _("Infinity")
elif time == 0:
time_str = "-"
else: else:
time_str = common.ftime(time) time_str = common.ftime(time)
cell.set_property('text', time_str) cell.set_property('text', time_str)
@ -574,9 +572,9 @@ class DelugeGTK:
dlrate = int(state['download_rate']) dlrate = int(state['download_rate'])
ulrate = int(state['upload_rate']) ulrate = int(state['upload_rate'])
try: try:
eta = common.get_eta(state["total_size"], state["total_download"], state["download_rate"]) eta = common.get_eta(state["total_size"], state["total_done"], state["download_rate"])
except ZeroDivisionError: except ZeroDivisionError:
eta = -1 eta = 0
share = float(self.calc_share_ratio(unique_id, state)) share = float(self.calc_share_ratio(unique_id, state))
rlist = [int(unique_id), int(queue), str(name), long(size), float(progress), str(message), rlist = [int(unique_id), int(queue), str(name), long(size), float(progress), str(message),
int(seeds), int(seeds_t), int(peers), int(peers_t), int(dlrate), int(ulrate), int(eta), float(share)] int(seeds), int(seeds_t), int(peers), int(peers_t), int(dlrate), int(ulrate), int(eta), float(share)]