diff options
| -rw-r--r-- | module/plugins/hoster/NitroflareCom.py | 8 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/module/plugins/hoster/NitroflareCom.py b/module/plugins/hoster/NitroflareCom.py index e10bf130b..1d1349a50 100644 --- a/module/plugins/hoster/NitroflareCom.py +++ b/module/plugins/hoster/NitroflareCom.py @@ -27,8 +27,6 @@ class NitroflareCom(SimpleHoster): LINK_FREE_PATTERN = r'(https?://[\w\-]+\.nitroflare\.com/.+?)"' - RECAPTCHA_KEY = "6Lenx_USAAAAAF5L1pmTWvWcH73dipAEzNnmNLgy" - PREMIUM_ONLY_PATTERN = r'This file is available with Premium only' WAIT_PATTERN = r'You have to wait .+?<' ERROR_PATTERN = r'downloading is not possible' @@ -70,8 +68,4 @@ class NitroflareCom(SimpleHoster): self.logWarning("Captcha unfilled") return - m = re.search(self.LINK_FREE_PATTERN, self.html) - if m: - self.link = m.group(1) - else: - self.logError("Unable to detect direct link") + return super(NitroflareCom, self).handleFree(pyfile) diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index ff718984e..11c6c64f2 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.47" + __version__ = "1.48" __pattern__ = r'^unmatchable$' __config__ = [("use_premium", "bool", "Use premium account if available" , True), @@ -492,9 +492,13 @@ class SimpleHoster(Hoster): self.checkFile() except Fail, e: #@TODO: Move to PluginThread in 0.4.10 - if self.getConfig('fallback', True) and self.premium: + if str(e) == _("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: self.logWarning(_("Premium download failed"), e) self.retryFree() + else: raise Fail(e) |