From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/hoster/FileboomMe.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'module/plugins/hoster/FileboomMe.py') diff --git a/module/plugins/hoster/FileboomMe.py b/module/plugins/hoster/FileboomMe.py index 9cdeebe3d..717ce549d 100644 --- a/module/plugins/hoster/FileboomMe.py +++ b/module/plugins/hoster/FileboomMe.py @@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class FileboomMe(SimpleHoster): __name__ = "FileboomMe" __type__ = "hoster" - __version__ = "0.02" + __version__ = "0.03" __pattern__ = r'https?://f(?:ile)?boom\.me/file/(?P\w+)' @@ -30,12 +30,12 @@ class FileboomMe(SimpleHoster): def setup(self): - self.resumeDownload = True - self.multiDL = False - self.chunkLimit = 1 + self.resume_download = True + self.multi_dl = False + self.chunk_limit = 1 - def handleFree(self, pyfile): + def handle_free(self, pyfile): post_url = urljoin(pyfile.url, "/file/" + self.info['pattern']['ID']) m = re.search(r'data-slow-id="(\w+)"', self.html) @@ -55,7 +55,7 @@ class FileboomMe(SimpleHoster): m = re.search(self.CAPTCHA_PATTERN, self.html) if m: - captcha = self.decryptCaptcha(urljoin(pyfile.url, m.group(1))) + captcha = self.decrypt_captcha(urljoin(pyfile.url, m.group(1))) self.html = self.load(post_url, post={'CaptchaForm[code]' : captcha, @@ -64,10 +64,10 @@ class FileboomMe(SimpleHoster): 'uniqueId' : uniqueId}) if 'The verification code is incorrect' in self.html: - self.invalidCaptcha() + self.invalid_captcha() else: - self.checkErrors() + self.check_errors() self.html = self.load(post_url, post={'free' : 1, @@ -78,7 +78,7 @@ class FileboomMe(SimpleHoster): self.link = urljoin(pyfile.url, m.group(0)) else: - self.invalidCaptcha() + self.invalid_captcha() break -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/hoster/FileboomMe.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/FileboomMe.py') diff --git a/module/plugins/hoster/FileboomMe.py b/module/plugins/hoster/FileboomMe.py index 717ce549d..97414cbf1 100644 --- a/module/plugins/hoster/FileboomMe.py +++ b/module/plugins/hoster/FileboomMe.py @@ -11,6 +11,7 @@ class FileboomMe(SimpleHoster): __name__ = "FileboomMe" __type__ = "hoster" __version__ = "0.03" + __status__ = "stable" __pattern__ = r'https?://f(?:ile)?boom\.me/file/(?P\w+)' -- cgit v1.2.3 From 027cb529d79558de19c47da88a782b31745a65c9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 21 Jul 2015 22:53:37 +0200 Subject: New Captcha skeleton --- module/plugins/hoster/FileboomMe.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/hoster/FileboomMe.py') diff --git a/module/plugins/hoster/FileboomMe.py b/module/plugins/hoster/FileboomMe.py index 97414cbf1..8d0f5d89c 100644 --- a/module/plugins/hoster/FileboomMe.py +++ b/module/plugins/hoster/FileboomMe.py @@ -56,7 +56,7 @@ class FileboomMe(SimpleHoster): m = re.search(self.CAPTCHA_PATTERN, self.html) if m: - captcha = self.decrypt_captcha(urljoin(pyfile.url, m.group(1))) + captcha = self.captcha.decrypt_image(urljoin(pyfile.url, m.group(1))) self.html = self.load(post_url, post={'CaptchaForm[code]' : captcha, @@ -65,7 +65,7 @@ class FileboomMe(SimpleHoster): 'uniqueId' : uniqueId}) if 'The verification code is incorrect' in self.html: - self.invalid_captcha() + self.captcha.invalid() else: self.check_errors() @@ -79,7 +79,7 @@ class FileboomMe(SimpleHoster): self.link = urljoin(pyfile.url, m.group(0)) else: - self.invalid_captcha() + self.captcha.invalid() break -- cgit v1.2.3 From 6af9b38a8d5d49355b85aef6ddd003605d6bba05 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 23 Jul 2015 23:44:45 +0200 Subject: Improve Captcha --- module/plugins/hoster/FileboomMe.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/FileboomMe.py') diff --git a/module/plugins/hoster/FileboomMe.py b/module/plugins/hoster/FileboomMe.py index 8d0f5d89c..a0b49d1bd 100644 --- a/module/plugins/hoster/FileboomMe.py +++ b/module/plugins/hoster/FileboomMe.py @@ -56,7 +56,7 @@ class FileboomMe(SimpleHoster): m = re.search(self.CAPTCHA_PATTERN, self.html) if m: - captcha = self.captcha.decrypt_image(urljoin(pyfile.url, m.group(1))) + captcha = self.captcha.decrypt(urljoin(pyfile.url, m.group(1))) self.html = self.load(post_url, post={'CaptchaForm[code]' : captcha, -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/hoster/FileboomMe.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/FileboomMe.py') diff --git a/module/plugins/hoster/FileboomMe.py b/module/plugins/hoster/FileboomMe.py index a0b49d1bd..2798d9eda 100644 --- a/module/plugins/hoster/FileboomMe.py +++ b/module/plugins/hoster/FileboomMe.py @@ -11,7 +11,7 @@ class FileboomMe(SimpleHoster): __name__ = "FileboomMe" __type__ = "hoster" __version__ = "0.03" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'https?://f(?:ile)?boom\.me/file/(?P\w+)' @@ -32,7 +32,7 @@ class FileboomMe(SimpleHoster): def setup(self): self.resume_download = True - self.multi_dl = False + self.multiDL = False self.chunk_limit = 1 -- cgit v1.2.3