Improve Captcha task managing

4 files changed, 5 insertions, 15 deletions

diff --git a/module/plugins/captcha/AdYouLike.py b/module/plugins/captcha/AdYouLike.py
index c21a3d4fa..c2e5a461d 100644
--- a/module/plugins/captcha/AdYouLike.py
+++ b/module/plugins/captcha/AdYouLike.py
@@ -9,7 +9,7 @@ from module.plugins.internal.CaptchaService import CaptchaService
 class AdYouLike(CaptchaService):
     __name__    = "AdYouLike"
     __type__    = "captcha"
-    __version__ = "0.09"
+    __version__ = "0.10"
     __status__  = "testing"
 
     __description__ = """AdYouLike captcha service plugin"""
@@ -87,6 +87,4 @@ class AdYouLike(CaptchaService):
                   '_ayl_token_challenge': challenge['token'],
                   '_ayl_response'       : response}
 
-        self.log_debug("Result: %s" % response)
-
         return result
diff --git a/module/plugins/captcha/AdsCaptcha.py b/module/plugins/captcha/AdsCaptcha.py
index 234d2a0cf..eb547de8b 100644
--- a/module/plugins/captcha/AdsCaptcha.py
+++ b/module/plugins/captcha/AdsCaptcha.py
@@ -9,7 +9,7 @@ from module.plugins.internal.CaptchaService import CaptchaService
 class AdsCaptcha(CaptchaService):
     __name__    = "AdsCaptcha"
     __type__    = "captcha"
-    __version__ = "0.12"
+    __version__ = "0.13"
     __status__  = "testing"
 
     __description__ = """AdsCaptcha captcha service plugin"""
@@ -58,7 +58,4 @@ class AdsCaptcha(CaptchaService):
                                     get={'cid': challenge, 'dummy': random.random()},
                                     cookies=True,
                                     input_type="jpg")
-
-        self.log_debug("Result: %s" % result)
-
         return result
diff --git a/module/plugins/captcha/ReCaptcha.py b/module/plugins/captcha/ReCaptcha.py
index b30f110d4..535525761 100644
--- a/module/plugins/captcha/ReCaptcha.py
+++ b/module/plugins/captcha/ReCaptcha.py
@@ -12,7 +12,7 @@ from module.plugins.internal.CaptchaService import CaptchaService
 class ReCaptcha(CaptchaService):
     __name__    = "ReCaptcha"
     __type__    = "captcha"
-    __version__ = "0.20"
+    __version__ = "0.21"
     __status__  = "testing"
 
     __description__ = """ReCaptcha captcha service plugin"""
@@ -85,8 +85,6 @@ class ReCaptcha(CaptchaService):
                               cookies=True,
                               input_type="jpg")
 
-        self.log_debug("Result: %s" % result)
-
         return result, challenge
 
 
@@ -175,7 +173,7 @@ class ReCaptcha(CaptchaService):
                                               timeout=30)
         response = base64.b64encode('{"response":"%s"}' % captcha_response)
 
-        self.log_debug("Result: %s" % response)
+        self.log_debug("Result: `%s`" % response)
 
         timeToSolve     = int(round(time.time() * 1000)) - millis_captcha_loading
         timeToSolveMore = timeToSolve + int(float("0." + str(random.randint(1, 99999999))) * 500)
diff --git a/module/plugins/captcha/SolveMedia.py b/module/plugins/captcha/SolveMedia.py
index f5fb28fa0..06a2300cb 100644
--- a/module/plugins/captcha/SolveMedia.py
+++ b/module/plugins/captcha/SolveMedia.py
@@ -9,7 +9,7 @@ from module.plugins.internal.CaptchaService import CaptchaService
 class SolveMedia(CaptchaService):
     __name__    = "SolveMedia"
     __type__    = "captcha"
-    __version__ = "0.17"
+    __version__ = "0.18"
     __status__  = "testing"
 
     __description__ = """SolveMedia captcha service plugin"""
@@ -99,7 +99,4 @@ class SolveMedia(CaptchaService):
                                     get={'c': challenge},
                                     cookies=True,
                                     input_type="gif")
-
-        self.log_debug("Result: %s" % result)
-
         return result