fix #1464..

This commit is contained in:
A. Murat Eren
2005-12-24 16:53:47 +00:00
parent 5a436cdf02
commit 2111a6b53a
+8 -6
View File
@@ -98,24 +98,24 @@ class Fetcher:
bs, tt, = 1024, int(time()) bs, tt, = 1024, int(time())
s_time = time() s_time = time()
Tdiff = lambda: time() - s_time Tdiff = lambda: time() - s_time
size = existsize = self.existsize downloadedsize = existsize = self.existsize
symbol, depth = 'B/s', 0 symbol, depth = 'B/s', 0
st = time() st = time()
chunk = fileURI.read(bs) chunk = fileURI.read(bs)
size += len(chunk) downloadedsize += len(chunk)
if self.progress: if self.progress:
p = self.progress(totalsize, existsize) p = self.progress(totalsize, existsize)
self.percent = p.update(size) self.percent = p.update(downloadedsize)
self.complete = False self.complete = False
while chunk: while chunk:
dest.write(chunk) dest.write(chunk)
chunk = fileURI.read(bs) chunk = fileURI.read(bs)
size += len(chunk) downloadedsize += len(chunk)
ct = time() ct = time()
if int(tt) != int(ct): if int(tt) != int(ct):
self.rate = (size - existsize) / (ct - st) self.rate = (downloadedsize - existsize) / (ct - st)
if self.percent: if self.percent:
self.eta = '%02d:%02d:%02d' %\ self.eta = '%02d:%02d:%02d' %\
@@ -129,11 +129,13 @@ class Fetcher:
tt = time() tt = time()
if self.progress: if self.progress:
if p.update(size): if p.update(downloadedsize):
self.percent = p.percent self.percent = p.percent
if not self.complete: if not self.complete:
ctx.ui.display_progress(filename = self.url.filename(), ctx.ui.display_progress(filename = self.url.filename(),
percent = self.percent, percent = self.percent,
totalsize = totalsize,
downloadedsize = downloadedsize,
rate = self.rate, rate = self.rate,
eta = self.eta, eta = self.eta,
symbol = symbol) symbol = symbol)