diff options
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/captcha/SolveMedia.py | 4 | ||||
| -rw-r--r-- | module/plugins/hoster/Http.py | 9 | ||||
| -rw-r--r-- | module/plugins/hoster/RapidgatorNet.py | 6 |
3 files changed, 8 insertions, 11 deletions
diff --git a/module/plugins/captcha/SolveMedia.py b/module/plugins/captcha/SolveMedia.py index 06a2300cb..4f48c422c 100644 --- a/module/plugins/captcha/SolveMedia.py +++ b/module/plugins/captcha/SolveMedia.py @@ -9,7 +9,7 @@ from module.plugins.internal.CaptchaService import CaptchaService class SolveMedia(CaptchaService): __name__ = "SolveMedia" __type__ = "captcha" - __version__ = "0.18" + __version__ = "0.19" __status__ = "testing" __description__ = """SolveMedia captcha service plugin""" @@ -62,7 +62,7 @@ class SolveMedia(CaptchaService): except Fail, e: self.log_warning(e, trace=True) - self.pyfile.plugin.invalidCaptcha() + self.pyfile.plugin.captcha.invalid() result = None html = self.pyfile.plugin.load("http://api.solvemedia.com/papi/verify.noscript", diff --git a/module/plugins/hoster/Http.py b/module/plugins/hoster/Http.py index 777806641..fdf927bbd 100644 --- a/module/plugins/hoster/Http.py +++ b/module/plugins/hoster/Http.py @@ -9,7 +9,7 @@ from module.plugins.internal.Hoster import Hoster class Http(Hoster): __name__ = "Http" __type__ = "hoster" - __version__ = "0.06" + __version__ = "0.07" __status__ = "testing" __pattern__ = r'(?:jd|pys?)://.+' @@ -29,13 +29,8 @@ class Http(Hoster): url = re.sub(r'^(jd|py)', "http", pyfile.url) netloc = urlparse.urlparse(url).netloc - link = self.isresource(url) - - if not link: - return - for _i in xrange(2): - self.download(link, ref=False, disposition=True) + self.download(url, ref=False, disposition=True) if self.req.code in (404, 410): self.offline() diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py index f8584c0b9..52aab2411 100644 --- a/module/plugins/hoster/RapidgatorNet.py +++ b/module/plugins/hoster/RapidgatorNet.py @@ -15,7 +15,7 @@ from module.plugins.internal.misc import json, seconds_to_midnight class RapidgatorNet(SimpleHoster): __name__ = "RapidgatorNet" __type__ = "hoster" - __version__ = "0.41" + __version__ = "0.42" __status__ = "testing" __pattern__ = r'http://(?:www\.)?(rapidgator\.net|rg\.to)/file/\w+' @@ -158,7 +158,9 @@ class RapidgatorNet(SimpleHoster): if "The verification code is incorrect" in self.data: self.retry_captcha() else: - self.captcha.correct() + m = re.search(self.LINK_FREE_PATTERN, self.data) + if m is not None: + self.link = m.group(1) def handle_captcha(self): |