diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-03-21 17:15:08 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-03-21 17:15:08 +0100 |
| commit | 73aeac3f1411fb8b9797856d0bf1730414915791 (patch) | |
| tree | f8e61f5fdf881b8988ef87af80356aae85665e85 | |
| parent | [UpdateManager] Fix https://github.com/pyload/pyload/issues/1272 (diff) | |
| download | pyload-73aeac3f1411fb8b9797856d0bf1730414915791.tar.xz | |
[SimpleHoster] Fix checkErrors (2)
| -rw-r--r-- | module/plugins/internal/MultiHoster.py | 3 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index fb76c58f4..350397f8b 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r class MultiHoster(SimpleHoster): __name__ = "MultiHoster" __type__ = "hoster" - __version__ = "0.38" + __version__ = "0.39" __pattern__ = r'^unmatchable$' __config__ = [("use_premium" , "bool", "Use premium account if available" , True), @@ -82,6 +82,7 @@ class MultiHoster(SimpleHoster): except Fail, e: #@TODO: Move to PluginThread in 0.4.10 if self.premium: + self.logWarning(_("Premium download failed")) self.retryFree() elif self.getConfig("revertfailed", True) \ diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 047d9edde..8a3381c53 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0): class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "1.28" + __version__ = "1.29" __pattern__ = r'^unmatchable$' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -491,6 +491,7 @@ class SimpleHoster(Hoster): except Fail, e: #@TODO: Move to PluginThread in 0.4.10 if self.premium: + self.logWarning(_("Premium download failed")) self.retryFree() else: raise Fail(e) @@ -567,15 +568,15 @@ class SimpleHoster(Hoster): self.info['error'] = errmsg - if "min" in errmsg: - self.wait(1 * 60) - - elif "hour" in errmsg: + if "hour" in errmsg: self.wait(1 * 60 * 60, True) elif re.search("da(il)?y|today", errmsg): self.wait(secondsToMidnight(gmt=2), True) + elif "minute" in errmsg: + self.wait(1 * 60) + else: self.error(errmsg) |