diff options
Diffstat (limited to 'pyload/plugin/hook')
| -rw-r--r-- | pyload/plugin/hook/BypassCaptcha.py | 8 | ||||
| -rw-r--r-- | pyload/plugin/hook/Captcha9Kw.py | 26 | ||||
| -rw-r--r-- | pyload/plugin/hook/CaptchaBrotherhood.py | 4 | ||||
| -rw-r--r-- | pyload/plugin/hook/DeathByCaptcha.py | 4 | ||||
| -rw-r--r-- | pyload/plugin/hook/ImageTyperz.py | 6 |
5 files changed, 24 insertions, 24 deletions
diff --git a/pyload/plugin/hook/BypassCaptcha.py b/pyload/plugin/hook/BypassCaptcha.py index 554452776..95be5f3a6 100644 --- a/pyload/plugin/hook/BypassCaptcha.py +++ b/pyload/plugin/hook/BypassCaptcha.py @@ -104,21 +104,21 @@ class BypassCaptcha(Hook): if self.getCredits() > 0: task.handler.append(self) - task.data['service'] = self.__class__.__name__ + task.data['service'] = self.getClassName() task.setWaiting(100) self._processCaptcha(task) else: - self.logInfo(_("Your %s account has not enough credits") % self.__class__.__name__) + self.logInfo(_("Your %s account has not enough credits") % self.getClassName()) def captchaCorrect(self, task): - if task.data['service'] == self.__class__.__name__ and "ticket" in task.data: + if task.data['service'] == self.getClassName() and "ticket" in task.data: self.respond(task.data['ticket'], True) def captchaInvalid(self, task): - if task.data['service'] == self.__class__.__name__ and "ticket" in task.data: + if task.data['service'] == self.getClassName() and "ticket" in task.data: self.respond(task.data['ticket'], False) diff --git a/pyload/plugin/hook/Captcha9Kw.py b/pyload/plugin/hook/Captcha9Kw.py index bbf283623..9ceab4b2b 100644 --- a/pyload/plugin/hook/Captcha9Kw.py +++ b/pyload/plugin/hook/Captcha9Kw.py @@ -13,27 +13,27 @@ from pyload.network.RequestFactory import getURL from pyload.plugin.Hook import Hook, threaded -class Captcha9kw(Hook): +class Captcha9Kw(Hook): __name = "Captcha9Kw" __type = "hook" __version = "0.28" - __config = [("ssl" , "bool" , "Use HTTPS" , True ), - ("force" , "bool" , "Force captcha resolving even if client is connected" , True ), - ("confirm" , "bool" , "Confirm Captcha (cost +6 credits)" , False ), - ("captchaperhour", "int" , "Captcha per hour" , "9999" ), - ("captchapermin" , "int" , "Captcha per minute" , "9999" ), - ("prio" , "int" , "Priority (max 10)(cost +0 -> +10 credits)" , "0" ), - ("queue" , "int" , "Max. Queue (max 999)" , "50" ), + __config = [("ssl" , "bool" , "Use HTTPS" , True), + ("force" , "bool" , "Force captcha resolving even if client is connected" , True), + ("confirm" , "bool" , "Confirm Captcha (cost +6 credits)" , False), + ("captchaperhour", "int" , "Captcha per hour" , "9999"), + ("captchapermin" , "int" , "Captcha per minute" , "9999"), + ("prio" , "int" , "Priority (max 10)(cost +0 -> +10 credits)" , "0"), + ("queue" , "int" , "Max. Queue (max 999)" , "50"), ("hoster_options", "string" , "Hoster options (format: pluginname:prio=1:selfsolfe=1:confirm=1:timeout=900|...)", "ShareonlineBiz:prio=0:timeout=999 | UploadedTo:prio=0:timeout=999"), - ("selfsolve" , "bool" , "Selfsolve (manually solve your captcha in your 9kw client if active)" , "0" ), - ("passkey" , "password", "API key" , "" ), - ("timeout" , "int" , "Timeout in seconds (min 60, max 3999)" , "900" )] + ("selfsolve" , "bool" , "Selfsolve (manually solve your captcha in your 9kw client if active)" , "0"), + ("passkey" , "password", "API key" , ""), + ("timeout" , "int" , "Timeout in seconds (min 60, max 3999)" , "900")] __description = """Send captchas to 9kw.eu""" __license = "GPLv3" - __authors = [("RaNaN" , "RaNaN@pyload.org" ), - ("Walter Purcaro", "vuolter@gmail.com")] + __authors = [("RaNaN" , "RaNaN@pyload.org"), + ("Walter Purcaro", "vuolter@gmail.com")] API_URL = "http://www.9kw.eu/index.cgi" diff --git a/pyload/plugin/hook/CaptchaBrotherhood.py b/pyload/plugin/hook/CaptchaBrotherhood.py index 15338b0af..97e1ff25f 100644 --- a/pyload/plugin/hook/CaptchaBrotherhood.py +++ b/pyload/plugin/hook/CaptchaBrotherhood.py @@ -147,7 +147,7 @@ class CaptchaBrotherhood(Hook): if self.getCredits() > 10: task.handler.append(self) - task.data['service'] = self.__class__.__name__ + task.data['service'] = self.getClassName() task.setWaiting(100) self._processCaptcha(task) else: @@ -155,7 +155,7 @@ class CaptchaBrotherhood(Hook): def captchaInvalid(self, task): - if task.data['service'] == self.__class__.__name__ and "ticket" in task.data: + if task.data['service'] == self.getClassName() and "ticket" in task.data: res = self.api_response("complainCaptcha", task.data['ticket']) diff --git a/pyload/plugin/hook/DeathByCaptcha.py b/pyload/plugin/hook/DeathByCaptcha.py index b28848422..71d1ddb0a 100644 --- a/pyload/plugin/hook/DeathByCaptcha.py +++ b/pyload/plugin/hook/DeathByCaptcha.py @@ -188,13 +188,13 @@ class DeathByCaptcha(Hook): if balance > rate: task.handler.append(self) - task.data['service'] = self.__class__.__name__ + task.data['service'] = self.getClassName() task.setWaiting(180) self._processCaptcha(task) def captchaInvalid(self, task): - if task.data['service'] == self.__class__.__name__ and "ticket" in task.data: + if task.data['service'] == self.getClassName() and "ticket" in task.data: try: res = self.api_response("captcha/%d/report" % task.data['ticket'], True) diff --git a/pyload/plugin/hook/ImageTyperz.py b/pyload/plugin/hook/ImageTyperz.py index 6c3c5c84b..c134cdaeb 100644 --- a/pyload/plugin/hook/ImageTyperz.py +++ b/pyload/plugin/hook/ImageTyperz.py @@ -118,16 +118,16 @@ class ImageTyperz(Hook): if self.getCredits() > 0: task.handler.append(self) - task.data['service'] = self.__class__.__name__ + task.data['service'] = self.getClassName() task.setWaiting(100) self._processCaptcha(task) else: - self.logInfo(_("Your %s account has not enough credits") % self.__class__.__name__) + self.logInfo(_("Your %s account has not enough credits") % self.getClassName()) def captchaInvalid(self, task): - if task.data['service'] == self.__class__.__name__ and "ticket" in task.data: + if task.data['service'] == self.getClassName() and "ticket" in task.data: res = getURL(self.RESPOND_URL, post={'action': "SETBADIMAGE", 'username': self.getConfig('username'), |