diff options
| -rw-r--r-- | module/ThreadManager.py | 2 | ||||
| -rw-r--r-- | module/web/pyload/views.py | 3 | ||||
| -rwxr-xr-x | pyLoadCore.py | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/module/ThreadManager.py b/module/ThreadManager.py index 70ac1c787..93ac8e78b 100644 --- a/module/ThreadManager.py +++ b/module/ThreadManager.py @@ -18,7 +18,7 @@ @author: RaNaN """ -from os.path import exists +from os.path import exists, join import re from subprocess import Popen from threading import Event diff --git a/module/web/pyload/views.py b/module/web/pyload/views.py index 880ec7843..874f25ebf 100644 --- a/module/web/pyload/views.py +++ b/module/web/pyload/views.py @@ -104,8 +104,6 @@ def queue(request): else: pyfile["icon"] = "status_downloading.png" - - #@TODO: replace lambdas data = zip(queue.keys(), queue.values()) data.sort(key=get_sort_key) @@ -282,7 +280,6 @@ def collector(request): else: pyfile["icon"] = "status_downloading.png" - #@TODO: replace lambdas data = zip(queue.keys(), queue.values()) data.sort(key=get_sort_key) diff --git a/pyLoadCore.py b/pyLoadCore.py index f3d6de7e0..75b622ce8 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -457,7 +457,7 @@ class ServerMethods(): """ dict with current server status """ status = {} status['pause'] = self.core.threadManager.pause - status['activ'] = len([x.active for x in self.core.threadManager.threads if x.active]) + status['activ'] = len(self.core.threadManager.processingIds()) status['queue'] = self.core.files.getFileCount() status['total'] = self.core.files.getFileCount() status['speed'] = 0 |