Merge pull request #1 from pyload/stable

Merge

1 files changed, 69 insertions, 59 deletions

diff --git a/module/plugins/hooks/DeathByCaptcha.py b/module/plugins/hooks/DeathByCaptcha.py
index f7bc1b90f..f03ac4567 100644
--- a/module/plugins/hooks/DeathByCaptcha.py
+++ b/module/plugins/hooks/DeathByCaptcha.py
@@ -1,33 +1,18 @@
 # -*- coding: utf-8 -*-
 
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License,
-    or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-    @author: mkaay, RaNaN, zoidberg
-"""
 from __future__ import with_statement
 
-from thread import start_new_thread
+import re
+
+from base64 import b64encode
 from pycurl import FORM_FILE, HTTPHEADER
+from thread import start_new_thread
 from time import sleep
-from base64 import b64encode
-import re
 
-from module.network.RequestFactory import getRequest
+from module.common.json_layer import json_loads
 from module.network.HTTPRequest import BadHeader
+from module.network.RequestFactory import getRequest
 from module.plugins.Hook import Hook
-from module.common.json_layer import json_loads
 
 
 class DeathByCaptchaException(Exception):
@@ -40,40 +25,56 @@ class DeathByCaptchaException(Exception):
                   'invalid-request': 'Invalid request',
                   'timed-out': 'No CAPTCHA solution received in time'}
 
+
     def __init__(self, err):
         self.err = err
 
+
     def getCode(self):
         return self.err
 
+
     def getDesc(self):
         if self.err in self.DBC_ERRORS.keys():
             return self.DBC_ERRORS[self.err]
         else:
             return self.err
 
+
     def __str__(self):
         return "<DeathByCaptchaException %s>" % self.err
 
+
     def __repr__(self):
         return "<DeathByCaptchaException %s>" % self.err
 
 
 class DeathByCaptcha(Hook):
-    __name__ = "DeathByCaptcha"
-    __version__ = "0.03"
-    __description__ = """Send captchas to DeathByCaptcha.com"""
-    __config__ = [("activated", "bool", "Activated", False),
-                  ("username", "str", "Username", ""),
+    __name__    = "DeathByCaptcha"
+    __type__    = "hook"
+    __version__ = "0.04"
+
+    __config__ = [("username", "str", "Username", ""),
                   ("passkey", "password", "Password", ""),
                   ("force", "bool", "Force DBC even if client is connected", False)]
-    __author_name__ = ("RaNaN", "zoidberg")
-    __author_mail__ = ("RaNaN@pyload.org", "zoidberg@mujmail.cz")
+
+    __description__ = """Send captchas to DeathByCaptcha.com"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
+                       ("zoidberg", "zoidberg@mujmail.cz")]
+
 
     API_URL = "http://api.dbcapi.me/api/"
 
+
+    #@TODO: Remove in 0.4.10
+    def initPeriodical(self):
+        pass
+
+
     def setup(self):
-        self.info = {}
+        self.info = {}  #@TODO: Remove in 0.4.10
+
 
     def call_api(self, api="captcha", post=False, multipart=False):
         req = getRequest()
@@ -85,18 +86,18 @@ class DeathByCaptcha(Hook):
             post.update({"username": self.getConfig("username"),
                          "password": self.getConfig("passkey")})
 
-        response = None
+        res = None
         try:
             json = req.load("%s%s" % (self.API_URL, api),
                             post=post,
                             multipart=multipart)
             self.logDebug(json)
-            response = json_loads(json)
+            res = json_loads(json)
 
-            if "error" in response:
-                raise DeathByCaptchaException(response['error'])
-            elif "status" not in response:
-                raise DeathByCaptchaException(str(response))
+            if "error" in res:
+                raise DeathByCaptchaException(res['error'])
+            elif "status" not in res:
+                raise DeathByCaptchaException(str(res))
 
         except BadHeader, e:
             if 403 == e.code:
@@ -113,27 +114,30 @@ class DeathByCaptcha(Hook):
         finally:
             req.close()
 
-        return response
+        return res
+
 
     def getCredits(self):
-        response = self.call_api("user", True)
+        res = self.call_api("user", True)
 
-        if 'is_banned' in response and response['is_banned']:
+        if 'is_banned' in res and res['is_banned']:
             raise DeathByCaptchaException('banned')
-        elif 'balance' in response and 'rate' in response:
-            self.info.update(response)
+        elif 'balance' in res and 'rate' in res:
+            self.info.update(res)
         else:
-            raise DeathByCaptchaException(response)
+            raise DeathByCaptchaException(res)
+
 
     def getStatus(self):
-        response = self.call_api("status", False)
+        res = self.call_api("status", False)
 
-        if 'is_service_overloaded' in response and response['is_service_overloaded']:
+        if 'is_service_overloaded' in res and res['is_service_overloaded']:
             raise DeathByCaptchaException('service-overload')
 
+
     def submit(self, captcha, captchaType="file", match=None):
-        #workaround multipart-post bug in HTTPRequest.py 
-        if re.match("^[A-Za-z0-9]*$", self.getConfig("passkey")):
+        #workaround multipart-post bug in HTTPRequest.py
+        if re.match("^\w*$", self.getConfig("passkey")):
             multipart = True
             data = (FORM_FILE, captcha)
         else:
@@ -142,25 +146,26 @@ class DeathByCaptcha(Hook):
                 data = f.read()
             data = "base64:" + b64encode(data)
 
-        response = self.call_api("captcha", {"captchafile": data}, multipart)
+        res = self.call_api("captcha", {"captchafile": data}, multipart)
 
-        if "captcha" not in response:
-            raise DeathByCaptchaException(response)
-        ticket = response['captcha']
+        if "captcha" not in res:
+            raise DeathByCaptchaException(res)
+        ticket = res['captcha']
 
-        for _ in xrange(24):
+        for _i in xrange(24):
             sleep(5)
-            response = self.call_api("captcha/%d" % ticket, False)
-            if response['text'] and response['is_correct']:
+            res = self.call_api("captcha/%d" % ticket, False)
+            if res['text'] and res['is_correct']:
                 break
         else:
             raise DeathByCaptchaException('timed-out')
 
-        result = response['text']
-        self.logDebug("result %s : %s" % (ticket, result))
+        result = res['text']
+        self.logDebug("Result %s : %s" % (ticket, result))
 
         return ticket, result
 
+
     def newCaptchaTask(self, task):
         if "service" in task.data:
             return False
@@ -181,9 +186,10 @@ class DeathByCaptcha(Hook):
             self.logError(e.getDesc())
             return False
 
-        balance, rate = self.info["balance"], self.info["rate"]
-        self.logInfo("Account balance: US$%.3f (%d captchas left at %.2f cents each)" % (balance / 100,
-                                                                                         balance // rate, rate))
+        balance, rate = self.info['balance'], self.info['rate']
+        self.logInfo(_("Account balance"),
+                     _("US$%.3f (%d captchas left at %.2f cents each)") % (balance / 100,
+                                                                           balance // rate, rate))
 
         if balance > rate:
             task.handler.append(self)
@@ -191,15 +197,19 @@ class DeathByCaptcha(Hook):
             task.setWaiting(180)
             start_new_thread(self.processCaptcha, (task,))
 
+
     def captchaInvalid(self, task):
         if task.data['service'] == self.__name__ and "ticket" in task.data:
             try:
-                response = self.call_api("captcha/%d/report" % task.data["ticket"], True)
+                res = self.call_api("captcha/%d/report" % task.data['ticket'], True)
+
             except DeathByCaptchaException, e:
                 self.logError(e.getDesc())
+
             except Exception, e:
                 self.logError(e)
 
+
     def processCaptcha(self, task):
         c = task.captchaFile
         try:
@@ -209,5 +219,5 @@ class DeathByCaptcha(Hook):
             self.logError(e.getDesc())
             return
 
-        task.data["ticket"] = ticket
+        task.data['ticket'] = ticket
         task.setResult(result)