diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-29 05:49:51 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-29 05:49:51 +0200 |
| commit | bb213b7804c840ac66e88ab31768b2a57f6f5771 (patch) | |
| tree | 5303bd07749b362dab071ada6197fe37dda85b27 /module/plugins | |
| parent | [UptoboxCom] Fixup (diff) | |
| download | pyload-bb213b7804c840ac66e88ab31768b2a57f6f5771.tar.xz | |
[SimpleHoster] Fix DB error
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/internal/MultiHoster.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleDereferer.py | 2 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index 350397f8b..ff4414034 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.39" + __version__ = "0.40" __pattern__ = r'^unmatchable$' __config__ = [("use_premium" , "bool", "Use premium account if available" , True), @@ -81,6 +81,8 @@ class MultiHoster(SimpleHoster): self.checkFile() except Fail, e: #@TODO: Move to PluginThread in 0.4.10 + err = str(e) #@TODO: Recheck in 0.4.10 + if self.premium: self.logWarning(_("Premium download failed")) self.retryFree() @@ -102,7 +104,7 @@ class MultiHoster(SimpleHoster): raise Retry(_("Revert to original hoster plugin")) else: - raise Fail(e) + raise Fail(err) def handlePremium(self, pyfile): diff --git a/module/plugins/internal/SimpleDereferer.py b/module/plugins/internal/SimpleDereferer.py index 022f006f2..1f04ab1c6 100644 --- a/module/plugins/internal/SimpleDereferer.py +++ b/module/plugins/internal/SimpleDereferer.py @@ -4,7 +4,7 @@ import re import urllib from module.plugins.Crypter import Crypter -from module.plugins.internal.SimpleHoster import create_getInfo, getFileURL, set_cookies +from module.plugins.internal.SimpleHoster import create_getInfo, set_cookies from module.utils import html_unescape diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index d362a9615..1d44a6642 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -239,7 +239,7 @@ def secondsToMidnight(gmt=0): class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "1.49" + __version__ = "1.50" __pattern__ = r'^unmatchable$' __config__ = [("use_premium", "bool", "Use premium account if available" , True), @@ -492,7 +492,9 @@ class SimpleHoster(Hoster): self.checkFile() except Fail, e: #@TODO: Move to PluginThread in 0.4.10 - if str(e) == _("No captcha result obtained in appropiate time by any of the plugins."): #@TODO: Fix in 0.4.10 + err = str(e) #@TODO: Recheck in 0.4.10 + + if err == _("No captcha result obtained in appropiate time by any of the plugins."): #@TODO: Fix in 0.4.10 self.checkFile() elif self.getConfig('fallback', True) and self.premium: @@ -500,7 +502,7 @@ class SimpleHoster(Hoster): self.retryFree() else: - raise Fail(e) + raise Fail(err) def downloadLink(self, link, disposition=True): |