summaryrefslogtreecommitdiffstats
path: root/pyLoadCore.py
diff options
context:
space:
mode:
authorGravatar mkaay <mkaay@mkaay.de> 2010-12-23 11:28:03 +0100
committerGravatar mkaay <mkaay@mkaay.de> 2010-12-23 11:28:03 +0100
commita4ba4ba12aff34c967f958576db40806656c3de8 (patch)
tree57a26d6559279fa4ed9c28fadfa31f4d36a7eceb /pyLoadCore.py
parentnew download backend integrated so far, downloading works, but still big todo... (diff)
downloadpyload-a4ba4ba12aff34c967f958576db40806656c3de8.tar.xz
fixed eta and progress, ready for first test
Diffstat (limited to 'pyLoadCore.py')
-rwxr-xr-xpyLoadCore.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyLoadCore.py b/pyLoadCore.py
index bdbd29215..b64ef33f2 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -579,7 +579,7 @@ class ServerMethods():
download = {}
download['id'] = pyfile.id
download['name'] = pyfile.name
- download['speed'] = pyfile.getSpeed()
+ download['speed'] = pyfile.getSpeed()/1024
download['eta'] = pyfile.getETA()
download['format_eta'] = pyfile.formatETA()
download['kbleft'] = pyfile.getBytesLeft() #holded for backward comp.
@@ -640,7 +640,7 @@ class ServerMethods():
status['speed'] = 0
for pyfile in [x.active for x in self.core.threadManager.threads if x.active and x.active != "quit"]:
- status['speed'] += pyfile.getSpeed()
+ status['speed'] += pyfile.getSpeed()/1024
status['download'] = not self.core.threadManager.pause and self.is_time_download()
status['reconnect'] = self.core.config['reconnect']['activated'] and self.is_time_reconnect()