diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-10-02 03:40:35 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-10-02 03:40:35 +0200 |
| commit | 2105c775f01a31079c82f80c06f87beaa0354de6 (patch) | |
| tree | a6bea65216e5f50047dd3cbbbdf0c5d399d4292c /module/plugins/internal | |
| parent | Fix https://github.com/pyload/pyload/issues/1917 + new function: parse_time (diff) | |
| download | pyload-2105c775f01a31079c82f80c06f87beaa0354de6.tar.xz | |
[UptoboxCom] Fix https://github.com/pyload/pyload/issues/1530 and https://github.com/pyload/pyload/issues/1904
Diffstat (limited to 'module/plugins/internal')
| -rw-r--r-- | module/plugins/internal/Base.py | 2 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/module/plugins/internal/Base.py b/module/plugins/internal/Base.py index 843d2ad11..bc9ef9158 100644 --- a/module/plugins/internal/Base.py +++ b/module/plugins/internal/Base.py @@ -355,7 +355,7 @@ class Base(Plugin): raise Retry(encode(msg)) #@TODO: Remove `encode` in 0.4.10 - def retry_captcha(self, attemps=10, wait=1, msg=_("Wrong captcha")): + def retry_captcha(self, attemps=10, wait=1, msg=_("Max captcha retries reached")): self.captcha.invalid() self.retry(attemps, wait, msg) diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 3a3e44619..5d6892ec5 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -16,7 +16,7 @@ from module.utils import fixup, fs_encode, parseFileSize as parse_size class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "1.91" + __version__ = "1.92" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -353,8 +353,8 @@ class SimpleHoster(Hoster): self.log_warning(self.info['error']) wait_time = parse_time(errmsg) - self.wantReconnect = wait_time > 300 - self.retry(1, wait_time, _("Download limit exceeded")) + self.wait(wait_time, reconnect=wait_time > 300) + self.restart(_("Download limit exceeded"), premium=True) if self.HAPPY_HOUR_PATTERN and re.search(self.HAPPY_HOUR_PATTERN, self.html): self.multiDL = True @@ -373,8 +373,8 @@ class SimpleHoster(Hoster): if re.search('limit|wait|slot', errmsg, re.I): wait_time = parse_time(errmsg) - self.wantReconnect = wait_time > 300 - self.retry(1, wait_time, _("Download limit exceeded")) + self.wait(wait_time, reconnect=wait_time > 300) + self.restart(_("Download limit exceeded"), premium=True) elif re.search('country|ip|region|nation', errmsg, re.I): self.fail(_("Connection from your current IP address is not allowed")) @@ -414,7 +414,7 @@ class SimpleHoster(Hoster): waitmsg = m.group(0).strip() wait_time = parse_time(waitmsg) - self.wait(wait_time, wait_time > 300) + self.wait(wait_time, econnect=wait_time > 300) self.info.pop('error', None) |