summaryrefslogtreecommitdiffstats
path: root/pyLoadCore.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2010-08-28 16:42:00 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2010-08-28 16:42:00 +0200
commit66e87e5b316b0fa813c8446402944dde770e556e (patch)
treed99fcfdba0f924360b319594f31d7ff98560561d /pyLoadCore.py
parentso.biz fix (diff)
downloadpyload-66e87e5b316b0fa813c8446402944dde770e556e.tar.xz
preparation for plugin updates
Diffstat (limited to 'pyLoadCore.py')
-rwxr-xr-xpyLoadCore.py23
1 files changed, 12 insertions, 11 deletions
diff --git a/pyLoadCore.py b/pyLoadCore.py
index f33cf3a1f..dd4741d3e 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -368,17 +368,18 @@ class Core(object):
file_created = False
else:
file_created = False
- if not file_exists and not quiet:
- if file_created:
- #self.log.info( _("%s created") % description )
- pass
- else:
- if not empty:
- self.log.warning(_("could not find %(desc)s: %(name)s") % {"desc": description, "name": tmp_name})
+
+ if not file_exists and not quiet:
+ if file_created:
+ #self.log.info( _("%s created") % description )
+ pass
else:
- print _("could not create %(desc)s: %(name)s") % {"desc": description, "name": tmp_name}
- if essential:
- exit()
+ if not empty:
+ self.log.warning(_("could not find %(desc)s: %(name)s") % {"desc": description, "name": tmp_name})
+ else:
+ print _("could not create %(desc)s: %(name)s") % {"desc": description, "name": tmp_name}
+ if essential:
+ exit()
def isClientConnected(self):
return (self.lastClientConnected + 30) > time.time()
@@ -520,7 +521,7 @@ class ServerMethods():
status['total'] = self.core.files.getFileCount()
status['speed'] = 0
- for pyfile in [x.active for x in self.core.threadManager.threads if x.active]:
+ for pyfile in [x.active for x in self.core.threadManager.threads if x.active and x.active != "quit"]:
status['speed'] += pyfile.getSpeed()
status['download'] = not self.core.threadManager.pause and self.is_time_download()