dandik bir bit rate hedesi..

This commit is contained in:
A. Murat Eren
2005-06-10 11:03:34 +00:00
parent db939f2cec
commit 85198b9c69
2 changed files with 9 additions and 3 deletions
+7 -1
View File
@@ -25,6 +25,7 @@ class Fetcher:
self.filepath = "" self.filepath = ""
self.filename = "" self.filename = ""
self.percent = 0 self.percent = 0
self.rate = 0
self.percentHook = None self.percentHook = None
def fetch (self): def fetch (self):
@@ -51,6 +52,8 @@ class Fetcher:
return self.filedest + "/" + self.filename return self.filedest + "/" + self.filename
def doGrab(self, file, dest, totalsize): def doGrab(self, file, dest, totalsize):
from time import time
tnow, oldsize = int(time()), 0
p = Progress(totalsize) p = Progress(totalsize)
bs, size = 1024*4, 0 bs, size = 1024*4, 0
@@ -61,10 +64,13 @@ class Fetcher:
dest.write(chunk) dest.write(chunk)
chunk = file.read(bs) chunk = file.read(bs)
size = size + len(chunk) size = size + len(chunk)
if tnow != int(time()):
self.rate = (size - oldsize) / (int(time()) - tnow) / 1024
oldsize, tnow = size, int(time())
if p.update(size): if p.update(size):
self.percent = p.percent self.percent = p.percent
if self.percentHook != None: if self.percentHook != None:
self.percentHook(self.filename, self.percent) self.percentHook(self.filename, self.percent, self.rate)
dest.close() dest.close()
print "" print ""
+2 -2
View File
@@ -13,8 +13,8 @@ sys.path.append("..")
import fetcher import fetcher
import pisiconfig import pisiconfig
def doProgress(filename, percent): def doProgress(filename, percent, rate):
out = '\r%-30.30s %%%3d' % (filename, percent) out = '\r%-30.30s %%%3d %d KB/s' % (filename, percent, rate)
stderr.write(out) stderr.write(out)
stderr.flush() stderr.flush()