diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-11-15 01:39:26 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-11-15 01:39:26 +0100 |
| commit | 38a5cae36ebeb1894fa3c6a5c2f2eb2d58fe293b (patch) | |
| tree | a2722fb675968caabdbe2e72173a00d6a9afa173 | |
| parent | [SimpleCrypter][SimpleHoster] Temp workaround (diff) | |
| download | pyload-38a5cae36ebeb1894fa3c6a5c2f2eb2d58fe293b.tar.xz | |
[Plugin] Fix wait routine 2
| -rw-r--r-- | module/plugins/Plugin.py | 9 | ||||
| -rw-r--r-- | module/plugins/hoster/ShareplaceCom.py | 1 | ||||
| -rw-r--r-- | module/plugins/hoster/YourfilesTo.py | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 4dadb67b4..1be74e896 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -326,9 +326,8 @@ class Plugin(Base): status = pyfile.status pyfile.setStatus("waiting") - self.logDebug("WAIT: %d seconds" % seconds, - "WAITUNTIL: %f" % pyfile.waitUntil, - "RECONNECT: %s" % self.wantReconnect) + self.logInfo(_("Wait: %d seconds") % pyfile.waitUntil - time(), + _("Reconnect: %s") % self.wantReconnect) if self.account: self.logDebug("Ignore reconnection due account logged") @@ -336,6 +335,8 @@ class Plugin(Base): while pyfile.waitUntil > time(): if pyfile.abort: self.abort() + + sleep(1) else: while pyfile.waitUntil > time(): self.thread.m.reconnecting.wait(2) @@ -348,6 +349,8 @@ class Plugin(Base): self.wantReconnect = False raise Reconnect + sleep(1) + self.waiting = False pyfile.status = status diff --git a/module/plugins/hoster/ShareplaceCom.py b/module/plugins/hoster/ShareplaceCom.py index cb0376b10..ccf4bcda5 100644 --- a/module/plugins/hoster/ShareplaceCom.py +++ b/module/plugins/hoster/ShareplaceCom.py @@ -33,7 +33,6 @@ class ShareplaceCom(Hoster): wait_time = self.get_waiting_time() self.setWait(wait_time) - self.logDebug("Waiting %d seconds." % wait_time) self.wait() diff --git a/module/plugins/hoster/YourfilesTo.py b/module/plugins/hoster/YourfilesTo.py index caa259cbd..83ab89110 100644 --- a/module/plugins/hoster/YourfilesTo.py +++ b/module/plugins/hoster/YourfilesTo.py @@ -34,7 +34,6 @@ class YourfilesTo(Hoster): wait_time = self.get_waiting_time() self.setWait(wait_time) - self.logDebug("Waiting %d seconds." % wait_time) self.wait() |