diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-11-15 01:39:26 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-11-15 06:24:04 +0100 |
| commit | 9f8a71f020fdfd1d87f133bcf1fffef11f864574 (patch) | |
| tree | a8f864cbc01391a011d69b9b753a3e43afe0628f /pyload/plugins | |
| parent | [SimpleCrypter][SimpleHoster] Temp workaround (diff) | |
| download | pyload-9f8a71f020fdfd1d87f133bcf1fffef11f864574.tar.xz | |
[Plugin] Fix wait routine 2
Diffstat (limited to 'pyload/plugins')
| -rw-r--r-- | pyload/plugins/Plugin.py | 9 | ||||
| -rw-r--r-- | pyload/plugins/hoster/ShareplaceCom.py | 1 | ||||
| -rw-r--r-- | pyload/plugins/hoster/YourfilesTo.py | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pyload/plugins/Plugin.py b/pyload/plugins/Plugin.py index 18f0bc940..c59d64911 100644 --- a/pyload/plugins/Plugin.py +++ b/pyload/plugins/Plugin.py @@ -341,9 +341,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") @@ -351,6 +350,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) @@ -363,6 +364,8 @@ class Plugin(Base): self.wantReconnect = False raise Reconnect + sleep(1) + self.waiting = False pyfile.status = status diff --git a/pyload/plugins/hoster/ShareplaceCom.py b/pyload/plugins/hoster/ShareplaceCom.py index ec59d061c..60d93698a 100644 --- a/pyload/plugins/hoster/ShareplaceCom.py +++ b/pyload/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/pyload/plugins/hoster/YourfilesTo.py b/pyload/plugins/hoster/YourfilesTo.py index 6a3a5c1ec..9e21144b7 100644 --- a/pyload/plugins/hoster/YourfilesTo.py +++ b/pyload/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() |