From fd105f8e51768ec1943cda2375bdfdbe5b0a3951 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 9 Jan 2015 00:35:51 +0100 Subject: "New Year" Update: hoster plugins --- module/plugins/hoster/LoadTo.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'module/plugins/hoster/LoadTo.py') diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py index 0a5b26410..b21a69b5f 100644 --- a/module/plugins/hoster/LoadTo.py +++ b/module/plugins/hoster/LoadTo.py @@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class LoadTo(SimpleHoster): __name__ = "LoadTo" __type__ = "hoster" - __version__ = "0.18" + __version__ = "0.19" __pattern__ = r'http://(?:www\.)?load\.to/\w+' @@ -27,7 +27,7 @@ class LoadTo(SimpleHoster): SIZE_PATTERN = r'Size: (?P[\d.,]+) (?P[\w^_]+)' OFFLINE_PATTERN = r'>Can\'t find file' - LINK_PATTERN = r'
404 Not Found"), 'html': re.compile("html")}) - - if check == "404": - self.invalidCaptcha() - self.retry() - elif check == "html": - self.logWarning(_("Downloaded file is an html page, will retry")) - self.retry() - getInfo = create_getInfo(LoadTo) -- cgit v1.2.3 From cf4ded052964047de88d676045329b8fa4fca2dc Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 22 Jan 2015 21:31:19 +0100 Subject: Update plugins after CaptchaService changes --- module/plugins/hoster/LoadTo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/LoadTo.py') diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py index b21a69b5f..a16735cf4 100644 --- a/module/plugins/hoster/LoadTo.py +++ b/module/plugins/hoster/LoadTo.py @@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class LoadTo(SimpleHoster): __name__ = "LoadTo" __type__ = "hoster" - __version__ = "0.19" + __version__ = "0.20" __pattern__ = r'http://(?:www\.)?load\.to/\w+' @@ -58,7 +58,7 @@ class LoadTo(SimpleHoster): if captcha_key is None: self.download(download_url) else: - challenge, response = solvemedia.challenge(captcha_key) + response, challenge = solvemedia.challenge(captcha_key) self.download(download_url, post={"adcopy_challenge": challenge, "adcopy_response": response}) -- cgit v1.2.3 From e9eb993cb369aef09741917370f2518168465f8c Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 28 Jan 2015 01:34:38 +0100 Subject: Spare code cosmetics --- module/plugins/hoster/LoadTo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/LoadTo.py') diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py index a16735cf4..6f4e8d73c 100644 --- a/module/plugins/hoster/LoadTo.py +++ b/module/plugins/hoster/LoadTo.py @@ -49,7 +49,7 @@ class LoadTo(SimpleHoster): # Set Timer - may be obsolete m = re.search(self.WAIT_PATTERN, self.html) if m: - self.wait(int(m.group(1))) + self.wait(m.group(1)) # Load.to is using solvemedia captchas since ~july 2014: solvemedia = SolveMedia(self) -- cgit v1.2.3 From a00d108f0214098ce41f4c6c612844323135ebc1 Mon Sep 17 00:00:00 2001 From: zapp-brannigan Date: Mon, 9 Feb 2015 12:49:43 +0100 Subject: [LoadTo.py] Update due to new Solvemedia handling --- module/plugins/hoster/LoadTo.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/LoadTo.py') diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py index 6f4e8d73c..7e6804ceb 100644 --- a/module/plugins/hoster/LoadTo.py +++ b/module/plugins/hoster/LoadTo.py @@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class LoadTo(SimpleHoster): __name__ = "LoadTo" __type__ = "hoster" - __version__ = "0.20" + __version__ = "0.21" __pattern__ = r'http://(?:www\.)?load\.to/\w+' @@ -49,7 +49,7 @@ class LoadTo(SimpleHoster): # Set Timer - may be obsolete m = re.search(self.WAIT_PATTERN, self.html) if m: - self.wait(m.group(1)) + self.wait(int(m.group(1))) # Load.to is using solvemedia captchas since ~july 2014: solvemedia = SolveMedia(self) @@ -58,8 +58,8 @@ class LoadTo(SimpleHoster): if captcha_key is None: self.download(download_url) else: - response, challenge = solvemedia.challenge(captcha_key) - self.download(download_url, post={"adcopy_challenge": challenge, "adcopy_response": response}) + response, challenge = solvemedia.challenge(captcha_key,None,pyfile.url) + self.download(download_url, post={"adcopy_challenge": challenge, "adcopy_response": response,"returnUrl":pyfile.url}) getInfo = create_getInfo(LoadTo) -- cgit v1.2.3 From 5a0adb38f6ed5eaba0fab771b3f1308e65df14a6 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 9 Feb 2015 17:21:49 +0100 Subject: [CaptchaService] Cleanup --- module/plugins/hoster/LoadTo.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'module/plugins/hoster/LoadTo.py') diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py index 7e6804ceb..be330e246 100644 --- a/module/plugins/hoster/LoadTo.py +++ b/module/plugins/hoster/LoadTo.py @@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class LoadTo(SimpleHoster): __name__ = "LoadTo" __type__ = "hoster" - __version__ = "0.21" + __version__ = "0.22" __pattern__ = r'http://(?:www\.)?load\.to/\w+' @@ -49,17 +49,20 @@ class LoadTo(SimpleHoster): # Set Timer - may be obsolete m = re.search(self.WAIT_PATTERN, self.html) if m: - self.wait(int(m.group(1))) + self.wait(m.group(1)) # Load.to is using solvemedia captchas since ~july 2014: - solvemedia = SolveMedia(self) + solvemedia = SolveMedia(self) captcha_key = solvemedia.detect_key() if captcha_key is None: self.download(download_url) else: - response, challenge = solvemedia.challenge(captcha_key,None,pyfile.url) - self.download(download_url, post={"adcopy_challenge": challenge, "adcopy_response": response,"returnUrl":pyfile.url}) + response, challenge = solvemedia.challenge(captcha_key) + self.download(download_url, + post={'adcopy_challenge': challenge, + 'adcopy_response' : response, + 'returnUrl' : pyfile.url}) getInfo = create_getInfo(LoadTo) -- cgit v1.2.3