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/DateiTo.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'module/plugins/hoster/DateiTo.py') diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py index 92a96b9ec..fe1a65e12 100644 --- a/module/plugins/hoster/DateiTo.py +++ b/module/plugins/hoster/DateiTo.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo class DateiTo(SimpleHoster): __name__ = "DateiTo" __type__ = "hoster" - __version__ = "0.09" + __version__ = "0.10" __pattern__ = r'http://(?:www\.)?datei\.to/datei/(?P\w+)\.html' __config__ = [("use_premium", "bool", "Use premium account if available", True)] @@ -29,19 +29,19 @@ class DateiTo(SimpleHoster): DATA_PATTERN = r'url: "(.*?)", data: "(.*?)",' - def handleFree(self, pyfile): + def handle_free(self, pyfile): url = 'http://datei.to/ajax/download.php' data = {'P': 'I', 'ID': self.info['pattern']['ID']} recaptcha = ReCaptcha(self) for _i in xrange(10): - self.logDebug("URL", url, "POST", data) + self.log_debug("URL", url, "POST", data) self.html = self.load(url, post=data) - self.checkErrors() + self.check_errors() if url.endswith('download.php') and 'P' in data: if data['P'] == 'I': - self.doWait() + self.do_wait() elif data['P'] == 'IV': break @@ -60,7 +60,7 @@ class DateiTo(SimpleHoster): self.link = self.html - def doWait(self): + def do_wait(self): m = re.search(self.WAIT_PATTERN, self.html) wait_time = int(m.group(1)) if m else 30 -- 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/DateiTo.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hoster/DateiTo.py') diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py index fe1a65e12..40725ff89 100644 --- a/module/plugins/hoster/DateiTo.py +++ b/module/plugins/hoster/DateiTo.py @@ -10,6 +10,7 @@ class DateiTo(SimpleHoster): __name__ = "DateiTo" __type__ = "hoster" __version__ = "0.10" + __status__ = "stable" __pattern__ = r'http://(?:www\.)?datei\.to/datei/(?P\w+)\.html' __config__ = [("use_premium", "bool", "Use premium account if available", True)] -- 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/DateiTo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/DateiTo.py') diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py index 40725ff89..63e71e776 100644 --- a/module/plugins/hoster/DateiTo.py +++ b/module/plugins/hoster/DateiTo.py @@ -2,7 +2,7 @@ import re -from module.plugins.internal.ReCaptcha import ReCaptcha +from module.plugins.captcha.ReCaptcha import ReCaptcha from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -- 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/DateiTo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hoster/DateiTo.py') diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py index 63e71e776..753494c53 100644 --- a/module/plugins/hoster/DateiTo.py +++ b/module/plugins/hoster/DateiTo.py @@ -10,7 +10,7 @@ class DateiTo(SimpleHoster): __name__ = "DateiTo" __type__ = "hoster" __version__ = "0.10" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'http://(?:www\.)?datei\.to/datei/(?P\w+)\.html' __config__ = [("use_premium", "bool", "Use premium account if available", True)] -- cgit v1.2.3 From 761ca5c66e07559925ebbdbc6531f9ca658b12ce Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 16:11:58 +0200 Subject: Code cosmetics --- module/plugins/hoster/DateiTo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster/DateiTo.py') diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py index 753494c53..d90fc5864 100644 --- a/module/plugins/hoster/DateiTo.py +++ b/module/plugins/hoster/DateiTo.py @@ -41,10 +41,10 @@ class DateiTo(SimpleHoster): self.check_errors() if url.endswith('download.php') and 'P' in data: - if data['P'] == 'I': + if data['P'] == "I": self.do_wait() - elif data['P'] == 'IV': + elif data['P'] == "IV": break m = re.search(self.DATA_PATTERN, self.html) -- cgit v1.2.3