summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/hooks/BypassCaptcha.py10
-rwxr-xr-xmodule/plugins/hooks/Captcha9kw.py6
-rw-r--r--module/plugins/hooks/CaptchaBrotherhood.py10
-rw-r--r--module/plugins/hooks/DeathByCaptcha.py10
-rw-r--r--module/plugins/hooks/ExpertDecoders.py10
-rw-r--r--module/plugins/hooks/ImageTyperz.py10
6 files changed, 28 insertions, 28 deletions
diff --git a/module/plugins/hooks/BypassCaptcha.py b/module/plugins/hooks/BypassCaptcha.py
index a32de7f42..8e0d9d36e 100644
--- a/module/plugins/hooks/BypassCaptcha.py
+++ b/module/plugins/hooks/BypassCaptcha.py
@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
from pycurl import FORM_FILE, LOW_SPEED_TIME
-from thread import start_new_thread
from module.network.HTTPRequest import BadHeader
from module.network.RequestFactory import getURL, getRequest
-from module.plugins.Hook import Hook
+from module.plugins.Hook import Hook, threaded
class BypassCaptchaException(Exception):
@@ -29,7 +28,7 @@ class BypassCaptchaException(Exception):
class BypassCaptcha(Hook):
__name__ = "BypassCaptcha"
__type__ = "hook"
- __version__ = "0.05"
+ __version__ = "0.06"
__config__ = [("force", "bool", "Force BC even if client is connected", False),
("passkey", "password", "Passkey", "")]
@@ -116,7 +115,7 @@ class BypassCaptcha(Hook):
task.handler.append(self)
task.data['service'] = self.__name__
task.setWaiting(100)
- start_new_thread(self.processCaptcha, (task,))
+ self._processCaptcha(task)
else:
self.logInfo(_("Your %s account has not enough credits") % self.__name__)
@@ -132,7 +131,8 @@ class BypassCaptcha(Hook):
self.respond(task.data['ticket'], False)
- def processCaptcha(self, task):
+ @threaded
+ def _processCaptcha(self, task):
c = task.captchaFile
try:
ticket, result = self.submit(c)
diff --git a/module/plugins/hooks/Captcha9kw.py b/module/plugins/hooks/Captcha9kw.py
index 33ad00c49..6eb4ef305 100755
--- a/module/plugins/hooks/Captcha9kw.py
+++ b/module/plugins/hooks/Captcha9kw.py
@@ -5,19 +5,18 @@ from __future__ import with_statement
import re
from base64 import b64encode
-from thread import start_new_thread
from time import sleep
from module.network.HTTPRequest import BadHeader
from module.network.RequestFactory import getURL
-from module.plugins.Hook import Hook
+from module.plugins.Hook import Hook, threaded
class Captcha9kw(Hook):
__name__ = "Captcha9kw"
__type__ = "hook"
- __version__ = "0.26"
+ __version__ = "0.27"
__config__ = [("activated" , "bool" , "Activated" , True ),
("ssl" , "bool" , "Use HTTPS" , True ),
@@ -68,6 +67,7 @@ class Captcha9kw(Hook):
return 0
+ @threaded
def _processCaptcha(self, task):
try:
with open(task.captchaFile, 'rb') as f:
diff --git a/module/plugins/hooks/CaptchaBrotherhood.py b/module/plugins/hooks/CaptchaBrotherhood.py
index 6d4127871..9a9f05b29 100644
--- a/module/plugins/hooks/CaptchaBrotherhood.py
+++ b/module/plugins/hooks/CaptchaBrotherhood.py
@@ -10,12 +10,11 @@ try:
except ImportError:
import Image
-from thread import start_new_thread
from time import sleep
from urllib import urlencode
from module.network.RequestFactory import getURL, getRequest
-from module.plugins.Hook import Hook
+from module.plugins.Hook import Hook, threaded
class CaptchaBrotherhoodException(Exception):
@@ -39,7 +38,7 @@ class CaptchaBrotherhoodException(Exception):
class CaptchaBrotherhood(Hook):
__name__ = "CaptchaBrotherhood"
__type__ = "hook"
- __version__ = "0.06"
+ __version__ = "0.07"
__config__ = [("username", "str", "Username", ""),
("force", "bool", "Force CT even if client is connected", False),
@@ -154,7 +153,7 @@ class CaptchaBrotherhood(Hook):
task.handler.append(self)
task.data['service'] = self.__name__
task.setWaiting(100)
- start_new_thread(self.processCaptcha, (task,))
+ self._processCaptcha(task)
else:
self.logInfo(_("Your CaptchaBrotherhood Account has not enough credits"))
@@ -164,7 +163,8 @@ class CaptchaBrotherhood(Hook):
res = self.get_api("complainCaptcha", task.data['ticket'])
- def processCaptcha(self, task):
+ @threaded
+ def _processCaptcha(self, task):
c = task.captchaFile
try:
ticket, result = self.submit(c)
diff --git a/module/plugins/hooks/DeathByCaptcha.py b/module/plugins/hooks/DeathByCaptcha.py
index f03ac4567..98412c218 100644
--- a/module/plugins/hooks/DeathByCaptcha.py
+++ b/module/plugins/hooks/DeathByCaptcha.py
@@ -6,13 +6,12 @@ import re
from base64 import b64encode
from pycurl import FORM_FILE, HTTPHEADER
-from thread import start_new_thread
from time import sleep
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.plugins.Hook import Hook, threaded
class DeathByCaptchaException(Exception):
@@ -52,7 +51,7 @@ class DeathByCaptchaException(Exception):
class DeathByCaptcha(Hook):
__name__ = "DeathByCaptcha"
__type__ = "hook"
- __version__ = "0.04"
+ __version__ = "0.05"
__config__ = [("username", "str", "Username", ""),
("passkey", "password", "Password", ""),
@@ -195,7 +194,7 @@ class DeathByCaptcha(Hook):
task.handler.append(self)
task.data['service'] = self.__name__
task.setWaiting(180)
- start_new_thread(self.processCaptcha, (task,))
+ self._processCaptcha(task)
def captchaInvalid(self, task):
@@ -210,7 +209,8 @@ class DeathByCaptcha(Hook):
self.logError(e)
- def processCaptcha(self, task):
+ @threaded
+ def _processCaptcha(self, task):
c = task.captchaFile
try:
ticket, result = self.submit(c)
diff --git a/module/plugins/hooks/ExpertDecoders.py b/module/plugins/hooks/ExpertDecoders.py
index 54de8eb53..c80401003 100644
--- a/module/plugins/hooks/ExpertDecoders.py
+++ b/module/plugins/hooks/ExpertDecoders.py
@@ -4,18 +4,17 @@ from __future__ import with_statement
from base64 import b64encode
from pycurl import LOW_SPEED_TIME
-from thread import start_new_thread
from uuid import uuid4
from module.network.HTTPRequest import BadHeader
from module.network.RequestFactory import getURL, getRequest
-from module.plugins.Hook import Hook
+from module.plugins.Hook import Hook, threaded
class ExpertDecoders(Hook):
__name__ = "ExpertDecoders"
__type__ = "hook"
- __version__ = "0.03"
+ __version__ = "0.04"
__config__ = [("force", "bool", "Force CT even if client is connected", False),
("passkey", "password", "Access key", "")]
@@ -50,7 +49,8 @@ class ExpertDecoders(Hook):
return 0
- def processCaptcha(self, task):
+ @threaded
+ def _processCaptcha(self, task):
task.data['ticket'] = ticket = uuid4()
result = None
@@ -85,7 +85,7 @@ class ExpertDecoders(Hook):
if self.getCredits() > 0:
task.handler.append(self)
task.setWaiting(100)
- start_new_thread(self.processCaptcha, (task,))
+ self._processCaptcha(task)
else:
self.logInfo(_("Your ExpertDecoders Account has not enough credits"))
diff --git a/module/plugins/hooks/ImageTyperz.py b/module/plugins/hooks/ImageTyperz.py
index f89d64c37..d448d1be9 100644
--- a/module/plugins/hooks/ImageTyperz.py
+++ b/module/plugins/hooks/ImageTyperz.py
@@ -6,10 +6,9 @@ import re
from base64 import b64encode
from pycurl import FORM_FILE, LOW_SPEED_TIME
-from thread import start_new_thread
from module.network.RequestFactory import getURL, getRequest
-from module.plugins.Hook import Hook
+from module.plugins.Hook import Hook, threaded
class ImageTyperzException(Exception):
@@ -33,7 +32,7 @@ class ImageTyperzException(Exception):
class ImageTyperz(Hook):
__name__ = "ImageTyperz"
__type__ = "hook"
- __version__ = "0.05"
+ __version__ = "0.06"
__config__ = [("username", "str", "Username", ""),
("passkey", "password", "Password", ""),
@@ -130,7 +129,7 @@ class ImageTyperz(Hook):
task.handler.append(self)
task.data['service'] = self.__name__
task.setWaiting(100)
- start_new_thread(self.processCaptcha, (task,))
+ self._processCaptcha(task)
else:
self.logInfo(_("Your %s account has not enough credits") % self.__name__)
@@ -150,7 +149,8 @@ class ImageTyperz(Hook):
self.logError(_("Bad captcha solution received, refund request failed"), res)
- def processCaptcha(self, task):
+ @threaded
+ def _processCaptcha(self, task):
c = task.captchaFile
try:
ticket, result = self.submit(c)
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 20:31:58 +0100