diff options
author | Walter Purcaro <vuolter@gmail.com> | 2014-11-03 12:10:11 +0100 |
---|---|---|
committer | Walter Purcaro <vuolter@gmail.com> | 2014-11-03 12:10:11 +0100 |
commit | cb5e1c3439a27d28df496b582bb38e1e9ed649cb (patch) | |
tree | 828b4d1c447542112e363c3a9dff0ce4e796eba8 | |
parent | Spare code cosmetics (diff) | |
download | pyload-cb5e1c3439a27d28df496b582bb38e1e9ed649cb.tar.xz |
[Plugin] Increase default captcha timeout to 5 minutes from 50 seconds
-rw-r--r-- | module/plugins/Plugin.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index feb81b096..8855e5980 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -149,7 +149,7 @@ class Plugin(Base): """ __name__ = "Plugin" __type__ = "hoster" - __version__ = "0.4" + __version__ = "0.05" __pattern__ = None __config__ = [] #: [("name", "type", "desc", "default")] @@ -214,7 +214,6 @@ class Plugin(Base): self.cTask = None #captcha task self.retries = 0 # amount of retries already made - self.html = None # some plugins store html code here self.init() @@ -371,7 +370,7 @@ class Plugin(Base): def decryptCaptcha(self, url, get={}, post={}, cookies=False, forceUser=False, imgtype='jpg', - result_type='textual'): + result_type='textual', timeout=290): """ Loads a captcha and decrypts it with ocr, plugin, user input :param url: url of captcha image @@ -412,7 +411,7 @@ class Plugin(Base): captchaManager = self.core.captchaManager task = captchaManager.newTask(img, imgtype, tmpCaptcha.name, result_type) self.cTask = task - captchaManager.handleCaptcha(task) + captchaManager.handleCaptcha(task, timeout) while task.isWaiting(): if self.pyfile.abort: @@ -675,5 +674,5 @@ class Plugin(Base): del self.req if hasattr(self, "thread"): del self.thread - if hasattr(self, "html"): - del self.html + # if hasattr(self, "html"): + # del self.html |