From 9f8a71f020fdfd1d87f133bcf1fffef11f864574 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 15 Nov 2014 01:39:26 +0100
Subject: [Plugin] Fix wait routine 2
---
pyload/plugins/Plugin.py | 9 ++++++---
pyload/plugins/hoster/ShareplaceCom.py | 1 -
pyload/plugins/hoster/YourfilesTo.py | 1 -
3 files changed, 6 insertions(+), 5 deletions(-)
(limited to 'pyload/plugins')
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()
--
cgit v1.2.3