Merge pull request #2 from pyload/stable

sync with stable

1 files changed, 7 insertions, 12 deletions

diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py
index 8f092ad0c..70f2be6fb 100644
--- a/module/plugins/hoster/CrockoCom.py
+++ b/module/plugins/hoster/CrockoCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class CrockoCom(SimpleHoster):
     __name__    = "CrockoCom"
     __type__    = "hoster"
-    __version__ = "0.21"
+    __version__ = "0.22"
     __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?(crocko|easy-share)\.com/\w+'
@@ -39,8 +39,8 @@ class CrockoCom(SimpleHoster):
 
         for _i in xrange(5):
             m = re.search(self.CAPTCHA_PATTERN, self.html)
-            if m:
-                url = urlparse.urljoin("http://crocko.com", m.group(1))
+            if m is not None:
+                url = urlparse.urljoin("http://crocko.com/", m.group(1))
                 self.wait(m.group(2))
                 self.html = self.load(url)
             else:
@@ -54,16 +54,11 @@ class CrockoCom(SimpleHoster):
         inputs = dict(re.findall(self.FORM_INPUT_PATTERN, form))
         recaptcha = ReCaptcha(self)
 
-        for _i in xrange(5):
-            inputs['recaptcha_response_field'], inputs['recaptcha_challenge_field'] = recaptcha.challenge()
-            self.download(action, post=inputs)
+        inputs['recaptcha_response_field'], inputs['recaptcha_challenge_field'] = recaptcha.challenge()
+        self.download(action, post=inputs)
 
-            if self.check_download({'captcha': recaptcha.KEY_AJAX_PATTERN}):
-                self.captcha.invalid()
-            else:
-                break
-        else:
-            self.fail(_("No valid captcha solution received"))
+        if self.check_file({'captcha': recaptcha.KEY_AJAX_PATTERN}):
+            self.retry_captcha()
 
 
 getInfo = create_getInfo(CrockoCom)