diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-23 21:56:42 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-23 21:56:42 +0100 |
| commit | 6e8a0f79f5ad7182a0bc35308ae06c63222667ed (patch) | |
| tree | 0026179d34f19b64bc689c63af85b949ce57fb83 /module/plugins | |
| parent | show button when files are selected (diff) | |
| download | pyload-6e8a0f79f5ad7182a0bc35308ae06c63222667ed.tar.xz | |
implemented interactions for multi user, show waiting queries on webui
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/Base.py | 5 | ||||
| -rw-r--r-- | module/plugins/hoster/BasePlugin.py | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/module/plugins/Base.py b/module/plugins/Base.py index 6ae2da249..70805b7f3 100644 --- a/module/plugins/Base.py +++ b/module/plugins/Base.py @@ -304,9 +304,8 @@ class Base(object): ocr = OCR() result = ocr.get_captcha(temp_file.name) else: - task = self.im.newCaptchaTask(img, imgtype, temp_file.name, result_type) + task = self.im.createCaptchaTask(img, imgtype, temp_file.name, self.__name__, result_type) self.task = task - self.im.handleTask(task) while task.isWaiting(): if self.abort(): @@ -322,7 +321,7 @@ class Base(object): elif task.error: self.fail(task.error) elif not task.result: - self.fail(_("No captcha result obtained in appropriate time by any of the plugins.")) + self.fail(_("No captcha result obtained in appropriate time.")) result = task.result self.log.debug("Received captcha result: %s" % str(result)) diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py index 293049a1a..c07164161 100644 --- a/module/plugins/hoster/BasePlugin.py +++ b/module/plugins/hoster/BasePlugin.py @@ -31,10 +31,8 @@ class BasePlugin(Hoster): #TODO: remove debug if pyfile.url.lower().startswith("debug"): - self.setWait(30) - self.wait() - self.decryptCaptcha("http://pyload.org/pie.png") - self.download("http://pyload.org/random100.bin") + self.decryptCaptcha("http://download.pyload.org/pie.png") + self.download("http://download.pyload.org/random100.bin") return # # if pyfile.url == "79": |