From 0d86af276ac81e610ca20d3c221c1f1caf2a525a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 30 May 2015 03:44:08 +0200 Subject: Update plugins after splitting CaptchaService --- module/plugins/hoster/DlFreeFr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/DlFreeFr.py') diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py index 72d15852c..030f7e971 100644 --- a/module/plugins/hoster/DlFreeFr.py +++ b/module/plugins/hoster/DlFreeFr.py @@ -5,7 +5,7 @@ import re from module.network.Browser import Browser from module.network.CookieJar import CookieJar -from module.plugins.internal.CaptchaService import AdYouLike +from module.plugins.internal.AdYouLike import AdYouLike from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, replace_patterns @@ -36,7 +36,7 @@ class CustomBrowser(Browser): class DlFreeFr(SimpleHoster): __name__ = "DlFreeFr" __type__ = "hoster" - __version__ = "0.28" + __version__ = "0.29" __pattern__ = r'http://(?:www\.)?dl\.free\.fr/(\w+|getfile\.pl\?file=/\w+)' __config__ = [("use_premium", "bool", "Use premium account if available", True)] -- cgit v1.2.3 From cfc406b4e5b855b1560cae880287b0a1f074aafe Mon Sep 17 00:00:00 2001 From: lazlev Date: Sat, 30 May 2015 15:09:05 +0200 Subject: Remove obsolete AdYouLike call AdYouLike is currently not used anymore on the hoster's site. Additionally the regex had to be edited to actually grab the domain value. --- module/plugins/hoster/DlFreeFr.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'module/plugins/hoster/DlFreeFr.py') diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py index 030f7e971..41ab93c96 100644 --- a/module/plugins/hoster/DlFreeFr.py +++ b/module/plugins/hoster/DlFreeFr.py @@ -94,14 +94,15 @@ class DlFreeFr(SimpleHoster): def handleFree(self, pyfile): action, inputs = self.parseHtmlForm('action="getfile.pl"') - adyoulike = AdYouLike(self) - response, challenge = adyoulike.challenge() - inputs.update(response) + # old - adyoulike is disabled for now + #adyoulike = AdYouLike(self) + #response, challenge = adyoulike.challenge() + #inputs.update(response) self.load("http://dl.free.fr/getfile.pl", post=inputs) headers = self.getLastHeaders() if headers.get("code") == 302 and "set-cookie" in headers and "location" in headers: - m = re.search("(.*?)=(.*?); path=(.*?); domain=(.*?)", headers.get("set-cookie")) + m = re.search("(.*?)=(.*?); path=(.*?); domain=(.*)", headers.get("set-cookie")) cj = CookieJar(__name__) if m: cj.setCookie(m.group(4), m.group(1), m.group(2), m.group(3)) -- cgit v1.2.3 From c1680df33f860e51295e0d76f682888188b641ab Mon Sep 17 00:00:00 2001 From: lazlev Date: Sat, 30 May 2015 21:55:02 +0200 Subject: Added missing download call --- module/plugins/hoster/DlFreeFr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/DlFreeFr.py') diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py index 41ab93c96..25a146ba4 100644 --- a/module/plugins/hoster/DlFreeFr.py +++ b/module/plugins/hoster/DlFreeFr.py @@ -110,8 +110,8 @@ class DlFreeFr(SimpleHoster): self.fail(_("Cookie error")) self.link = headers.get("location") - self.req.setCookieJar(cj) + self.download(self.link, disposition=True) else: self.fail(_("Invalid response")) -- cgit v1.2.3 From 5f2f25e37cc3afd9a600929432441eb171c86f04 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 30 May 2015 22:27:30 +0200 Subject: [DlFreeFr] Version up --- module/plugins/hoster/DlFreeFr.py | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'module/plugins/hoster/DlFreeFr.py') diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py index 25a146ba4..ff5ee7b92 100644 --- a/module/plugins/hoster/DlFreeFr.py +++ b/module/plugins/hoster/DlFreeFr.py @@ -5,7 +5,6 @@ import re from module.network.Browser import Browser from module.network.CookieJar import CookieJar -from module.plugins.internal.AdYouLike import AdYouLike from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, replace_patterns @@ -36,7 +35,7 @@ class CustomBrowser(Browser): class DlFreeFr(SimpleHoster): __name__ = "DlFreeFr" __type__ = "hoster" - __version__ = "0.29" + __version__ = "0.30" __pattern__ = r'http://(?:www\.)?dl\.free\.fr/(\w+|getfile\.pl\?file=/\w+)' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -44,12 +43,12 @@ class DlFreeFr(SimpleHoster): __description__ = """Dl.free.fr hoster plugin""" __license__ = "GPLv3" __authors__ = [("the-razer", "daniel_ AT gmx DOT net"), - ("zoidberg", "zoidberg@mujmail.cz"), - ("Toilal", "toilal.dev@gmail.com")] + ("zoidberg" , "zoidberg@mujmail.cz" ), + ("Toilal" , "toilal.dev@gmail.com" )] - NAME_PATTERN = r'Fichier:\s*(?P[^>]*)' - SIZE_PATTERN = r'Taille:\s*(?P[\d.,]+\w)o' + NAME_PATTERN = r'Fichier:\s*(?P[^>]*)' + SIZE_PATTERN = r'Taille:\s*(?P[\d.,]+\w)o' OFFLINE_PATTERN = r'Erreur 404 - Document non trouv|Fichier inexistant|Le fichier demandé n\'a pas été trouvé' @@ -84,6 +83,8 @@ class DlFreeFr(SimpleHoster): # Direct access to requested file for users using free.fr as Internet Service Provider. self.link = valid_url + self.download(self.link, disposition=True) + elif headers.get('code') == 404: self.offline() @@ -93,12 +94,6 @@ class DlFreeFr(SimpleHoster): def handleFree(self, pyfile): action, inputs = self.parseHtmlForm('action="getfile.pl"') - - # old - adyoulike is disabled for now - #adyoulike = AdYouLike(self) - #response, challenge = adyoulike.challenge() - #inputs.update(response) - self.load("http://dl.free.fr/getfile.pl", post=inputs) headers = self.getLastHeaders() if headers.get("code") == 302 and "set-cookie" in headers and "location" in headers: @@ -111,7 +106,6 @@ class DlFreeFr(SimpleHoster): self.link = headers.get("location") self.req.setCookieJar(cj) - self.download(self.link, disposition=True) else: self.fail(_("Invalid response")) -- cgit v1.2.3