diff options
Diffstat (limited to 'pyload/plugin/hook')
| -rw-r--r-- | pyload/plugin/hook/BypassCaptcha.py | 16 | ||||
| -rw-r--r-- | pyload/plugin/hook/CaptchaBrotherhood.py | 14 | ||||
| -rw-r--r-- | pyload/plugin/hook/DeathByCaptcha.py | 8 | ||||
| -rw-r--r-- | pyload/plugin/hook/ImageTyperz.py | 10 |
4 files changed, 24 insertions, 24 deletions
diff --git a/pyload/plugin/hook/BypassCaptcha.py b/pyload/plugin/hook/BypassCaptcha.py index 141ac7282..e3fae426e 100644 --- a/pyload/plugin/hook/BypassCaptcha.py +++ b/pyload/plugin/hook/BypassCaptcha.py @@ -35,9 +35,9 @@ class BypassCaptcha(Hook): __description = """Send captchas to BypassCaptcha.com""" __license = "GPLv3" - __authors = [("RaNaN" , "RaNaN@pyload.org" ), - ("Godofdream", "soilfcition@gmail.com"), - ("zoidberg" , "zoidberg@mujmail.cz" )] + __authors = [("RaNaN" , "RaNaN@pyload.org"), + ("Godofdream", "soilfcition@gmail.com"), + ("zoidberg" , "zoidberg@mujmail.cz")] PYLOAD_KEY = "4f771155b640970d5607f919a615bdefc67e7d32" @@ -84,7 +84,7 @@ class BypassCaptcha(Hook): def respond(self, ticket, success): try: res = getURL(self.RESPOND_URL, post={"task_id": ticket, "key": self.getConfig('passkey'), - "cv": 1 if success else 0}) + "cv": 1 if success else 0}) except BadHeader, e: self.logError(_("Could not send response"), e) @@ -104,21 +104,21 @@ class BypassCaptcha(Hook): if self.getCredits() > 0: task.handler.append(self) - task.data['service'] = self.__name + task.data['service'] = self.__class__.__name__ task.setWaiting(100) self._processCaptcha(task) else: - self.logInfo(_("Your %s account has not enough credits") % self.__name) + self.logInfo(_("Your %s account has not enough credits") % self.__class__.__name__) def captchaCorrect(self, task): - if task.data['service'] == self.__name and "ticket" in task.data: + if task.data['service'] == self.__class__.__name__ and "ticket" in task.data: self.respond(task.data['ticket'], True) def captchaInvalid(self, task): - if task.data['service'] == self.__name and "ticket" in task.data: + if task.data['service'] == self.__class__.__name__ and "ticket" in task.data: self.respond(task.data['ticket'], False) diff --git a/pyload/plugin/hook/CaptchaBrotherhood.py b/pyload/plugin/hook/CaptchaBrotherhood.py index eff005d14..15338b0af 100644 --- a/pyload/plugin/hook/CaptchaBrotherhood.py +++ b/pyload/plugin/hook/CaptchaBrotherhood.py @@ -46,8 +46,8 @@ class CaptchaBrotherhood(Hook): __description = """Send captchas to CaptchaBrotherhood.com""" __license = "GPLv3" - __authors = [("RaNaN" , "RaNaN@pyload.org" ), - ("zoidberg", "zoidberg@mujmail.cz")] + __authors = [("RaNaN" , "RaNaN@pyload.org"), + ("zoidberg", "zoidberg@mujmail.cz")] API_URL = "http://www.captchabrotherhood.com/" @@ -123,9 +123,9 @@ class CaptchaBrotherhood(Hook): def api_response(self, api, ticket): res = getURL("%s%s.aspx" % (self.API_URL, api), - get={"username": self.getConfig('username'), - "password": self.getConfig('passkey'), - "captchaID": ticket}) + get={"username": self.getConfig('username'), + "password": self.getConfig('passkey'), + "captchaID": ticket}) if not res.startswith("OK"): raise CaptchaBrotherhoodException("Unknown response: %s" % res) @@ -147,7 +147,7 @@ class CaptchaBrotherhood(Hook): if self.getCredits() > 10: task.handler.append(self) - task.data['service'] = self.__name + task.data['service'] = self.__class__.__name__ task.setWaiting(100) self._processCaptcha(task) else: @@ -155,7 +155,7 @@ class CaptchaBrotherhood(Hook): def captchaInvalid(self, task): - if task.data['service'] == self.__name and "ticket" in task.data: + if task.data['service'] == self.__class__.__name__ 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 4b77c8718..b28848422 100644 --- a/pyload/plugin/hook/DeathByCaptcha.py +++ b/pyload/plugin/hook/DeathByCaptcha.py @@ -59,8 +59,8 @@ class DeathByCaptcha(Hook): __description = """Send captchas to DeathByCaptcha.com""" __license = "GPLv3" - __authors = [("RaNaN" , "RaNaN@pyload.org" ), - ("zoidberg", "zoidberg@mujmail.cz")] + __authors = [("RaNaN" , "RaNaN@pyload.org"), + ("zoidberg", "zoidberg@mujmail.cz")] API_URL = "http://api.dbcapi.me/api/" @@ -188,13 +188,13 @@ class DeathByCaptcha(Hook): if balance > rate: task.handler.append(self) - task.data['service'] = self.__name + task.data['service'] = self.__class__.__name__ task.setWaiting(180) self._processCaptcha(task) def captchaInvalid(self, task): - if task.data['service'] == self.__name and "ticket" in task.data: + if task.data['service'] == self.__class__.__name__ 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 ca5e02559..5dadc09f1 100644 --- a/pyload/plugin/hook/ImageTyperz.py +++ b/pyload/plugin/hook/ImageTyperz.py @@ -40,8 +40,8 @@ class ImageTyperz(Hook): __description = """Send captchas to ImageTyperz.com""" __license = "GPLv3" - __authors = [("RaNaN" , "RaNaN@pyload.org" ), - ("zoidberg", "zoidberg@mujmail.cz")] + __authors = [("RaNaN" , "RaNaN@pyload.org"), + ("zoidberg", "zoidberg@mujmail.cz")] SUBMIT_URL = "http://captchatypers.com/Forms/UploadFileAndGetTextNEW.ashx" @@ -118,16 +118,16 @@ class ImageTyperz(Hook): if self.getCredits() > 0: task.handler.append(self) - task.data['service'] = self.__name + task.data['service'] = self.__class__.__name__ task.setWaiting(100) self._processCaptcha(task) else: - self.logInfo(_("Your %s account has not enough credits") % self.__name) + self.logInfo(_("Your %s account has not enough credits") % self.__class__.__name__) def captchaInvalid(self, task): - if task.data['service'] == self.__name and "ticket" in task.data: + if task.data['service'] == self.__class__.__name__ and "ticket" in task.data: res = getURL(self.RESPOND_URL, post={'action': "SETBADIMAGE", 'username': self.getConfig('username'), |