summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
Diffstat (limited to 'module')
-rw-r--r--module/plugins/hoster/ShareonlineBiz.py5
-rw-r--r--module/plugins/internal/Captcha.py4
2 files changed, 6 insertions, 3 deletions
diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index 765c1a791..bd8a8d1be 100644
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -166,12 +166,15 @@ class ShareonlineBiz(SimpleHoster):
if errmsg == "invalid":
self.fail(_("File not available"))
- elif errmsg in ("full", "freelimit", "size", "proxy"):
+ elif errmsg in ("freelimit", "size", "proxy"):
self.fail(_("Premium account needed"))
elif errmsg in ("expired", "server"):
self.retry(wait_time=600, reason=errmsg)
+ elif errmsg == "full":
+ self.retry(10, 600, _("Server is full"))
+
elif 'slot' in errmsg:
self.wantReconnect = True
self.retry(24, 3600, errmsg)
diff --git a/module/plugins/internal/Captcha.py b/module/plugins/internal/Captcha.py
index 8ba1a1829..57105caea 100644
--- a/module/plugins/internal/Captcha.py
+++ b/module/plugins/internal/Captcha.py
@@ -46,13 +46,13 @@ class Captcha(Plugin):
def decrypt(self, url, get={}, post={}, ref=False, cookies=False, decode=False,
- input_type='jpg', output_type='textual', ocr=True, timeout=300):
+ input_type='jpg', output_type='textual', ocr=True, timeout=120):
img = self.load(url, get=get, post=post, ref=ref, cookies=cookies, decode=decode)
return self._decrypt(img, input_type, output_type, ocr, timeout)
#@TODO: Definitely choose a better name for this method!
- def _decrypt(self, raw, input_type='jpg', output_type='textual', ocr=None, timeout=300):
+ def _decrypt(self, raw, input_type='jpg', output_type='textual', ocr=None, timeout=120):
"""
Loads a captcha and decrypts it with ocr, plugin, user input