Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/hooks/ClickAndLoad.py
	module/plugins/internal/CaptchaService.py
	pyload/plugins/addon/Checksum.py
	pyload/plugins/addon/DownloadScheduler.py
	pyload/plugins/addon/ExternalScripts.py
	pyload/plugins/addon/ExtractArchive.py
	pyload/plugins/addon/IRCInterface.py
	pyload/plugins/addon/MergeFiles.py
	pyload/plugins/addon/MultiHome.py
	pyload/plugins/addon/SkipRev.py
	pyload/plugins/addon/UnSkipOnFail.py
	pyload/plugins/addon/WindowsPhoneToastNotify.py
	pyload/plugins/container/CCF.py
	pyload/plugins/hook/BypassCaptcha.py
	pyload/plugins/hook/Captcha9kw.py
	pyload/plugins/hook/CaptchaBrotherhood.py
	pyload/plugins/hook/DeathByCaptcha.py
	pyload/plugins/hook/ExpertDecoders.py
	pyload/plugins/hook/ImageTyperz.py
	pyload/plugins/hoster/DlFreeFr.py
	pyload/plugins/internal/OCR.py

2 files changed, 393 insertions, 0 deletions

diff --git a/module/plugins/hooks/RestartSlow.py b/module/plugins/hooks/RestartSlow.py
new file mode 100644
index 000000000..587799235
--- /dev/null
+++ b/module/plugins/hooks/RestartSlow.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+import pycurl
+
+from module.plugins.Hook import Hook
+
+
+class RestartSlow(Hook):
+    __name__    = "RestartSlow"
+    __type__    = "hook"
+    __version__ = "0.02"
+
+    __config__ = [("free_limit"   , "int" ,  "Transfer speed threshold in kilobytes"                     , 100 ),
+                  ("free_time"    , "int" ,  "Sample interval in minutes"                                , 5   ),
+                  ("premium_limit", "int" ,  "Transfer speed threshold for premium download in kilobytes", 300 ),
+                  ("premium_time" , "int" ,  "Sample interval for premium download in minutes"           , 2   ),
+                  ("safe_mode"    , "bool",  "Don't restart if download is not resumable"                , True)]
+
+    __description__ = """Restart slow downloads"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    event_list = ["downloadStarts"]
+
+
+    def setup(self):
+        self.info = {'chunk': {}}
+
+
+    def initPeriodical(self):
+        pass
+
+
+    def periodical(self):
+        if not self.pyfile.req.dl:
+            return
+
+        if self.getConfig("safe_mode") and not self.pyfile.plugin.resumeDownload:
+            time  = 30
+            limit = 5
+        else:
+            type  = "premium" if self.pyfile.plugin.premium else "free"
+            time  = max(30, self.getConfig("%s_time" % type) * 60)
+            limit = max(5, self.getConfig("%s_limit" % type) * 1024)
+
+        chunks = [chunk for chunk in self.pyfile.req.dl.chunks \
+                  if chunk.id not in self.info['chunk'] or self.info['chunk'][chunk.id] not is (time, limit)]
+
+        for chunk in chunks:
+            chunk.c.setopt(pycurl.LOW_SPEED_TIME , time)
+            chunk.c.setopt(pycurl.LOW_SPEED_LIMIT, limit)
+
+            self.info['chunk'][chunk.id] = (time, limit)
+
+
+    def downloadStarts(self, pyfile, url, filename):
+        if self.cb or (self.getConfig("safe_mode") and not pyfile.plugin.resumeDownload):
+            return
+
+        super(RestartSlow, self).initPeriodical()
diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
new file mode 100644
index 000000000..965799e8e
--- /dev/null
+++ b/module/plugins/internal/CaptchaService.py
@@ -0,0 +1,332 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from random import random
+
+from module.common.json_layer import json_loads
+
+
+class CaptchaService:
+    __name__    = "CaptchaService"
+    __version__ = "0.16"
+
+    __description__ = """Base captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+
+
+    KEY_PATTERN = None
+
+    key = None  #: last key detected
+
+
+    def __init__(self, plugin):
+        self.plugin = plugin
+
+
+    def detect_key(self, html=None):
+        if not html:
+            if hasattr(self.plugin, "html") and self.plugin.html:
+                html = self.plugin.html
+            else:
+                errmsg = _("%s html not found") % self.__name__
+                self.plugin.fail(errmsg)  #@TODO: replace all plugin.fail(errmsg) with plugin.error(errmsg) in 0.4.10
+                raise TypeError(errmsg)
+
+        m = re.search(self.KEY_PATTERN, html)
+        if m:
+            self.key = m.group(1).strip()
+            self.plugin.logDebug("%s key: %s" % (self.__name__, self.key))
+            return self.key
+        else:
+            self.plugin.logDebug("%s key not found" % self.__name__)
+            return None
+
+
+    def challenge(self, key=None):
+        raise NotImplementedError
+
+
+    def result(self, server, challenge):
+        raise NotImplementedError
+
+
+class ReCaptcha(CaptchaService):
+    __name__    = "ReCaptcha"
+    __version__ = "0.08"
+
+    __description__ = """ReCaptcha captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+
+
+    KEY_PATTERN      = r'recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=([\w-]+)'
+    KEY_AJAX_PATTERN = r'Recaptcha\.create\s*\(\s*["\']([\w-]+)'
+
+
+    def detect_key(self, html=None):
+        if not html:
+            if hasattr(self.plugin, "html") and self.plugin.html:
+                html = self.plugin.html
+            else:
+                errmsg = _("ReCaptcha html not found")
+                self.plugin.fail(errmsg)
+                raise TypeError(errmsg)
+
+        m = re.search(self.KEY_PATTERN, html) or re.search(self.KEY_AJAX_PATTERN, html)
+        if m:
+            self.key = m.group(1).strip()
+            self.plugin.logDebug("ReCaptcha key: %s" % self.key)
+            return self.key
+        else:
+            self.plugin.logDebug("ReCaptcha key not found")
+            return None
+
+
+    def challenge(self, key=None):
+        if not key:
+            if self.detect_key():
+                key = self.key
+            else:
+                errmsg = _("ReCaptcha key not found")
+                self.plugin.fail(errmsg)
+                raise TypeError(errmsg)
+
+        html = self.plugin.req.load("http://www.google.com/recaptcha/api/challenge", get={'k': key})
+        try:
+            challenge = re.search("challenge : '(.+?)',", html).group(1)
+            server    = re.search("server : '(.+?)',", html).group(1)
+        except:
+            errmsg = _("ReCaptcha challenge pattern not found")
+            self.plugin.fail(errmsg)
+            raise ValueError(errmsg)
+
+        self.plugin.logDebug("ReCaptcha challenge: %s" % challenge)
+
+        return challenge, self.result(server, challenge)
+
+
+    def result(self, server, challenge):
+        result = self.plugin.decryptCaptcha("%simage" % server,
+                                            get={'c': challenge},
+                                            cookies=True,
+                                            forceUser=True,
+                                            imgtype="jpg")
+
+        self.plugin.logDebug("ReCaptcha result: %s" % result)
+
+        return result
+
+
+class AdsCaptcha(CaptchaService):
+    __name__    = "AdsCaptcha"
+    __version__ = "0.06"
+
+    __description__ = """AdsCaptcha captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+
+
+    CAPTCHAID_PATTERN  = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(\d+)'
+    PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*PublicKey=([\w-]+)'
+
+
+    def detect_key(self, html=None):
+        if not html:
+            if hasattr(self.plugin, "html") and self.plugin.html:
+                html = self.plugin.html
+            else:
+                errmsg = _("AdsCaptcha html not found")
+                self.plugin.fail(errmsg)
+                raise TypeError(errmsg)
+
+        m = re.search(self.PUBLICKEY_PATTERN, html)
+        n = re.search(self.CAPTCHAID_PATTERN, html)
+        if m and n:
+            self.key = (m.group(1).strip(), n.group(1).strip())  #: key is the tuple(PublicKey, CaptchaId)
+            self.plugin.logDebug("AdsCaptcha key|id: %s | %s" % self.key)
+            return self.key
+        else:
+            self.plugin.logDebug("AdsCaptcha key or id not found")
+            return None
+
+
+    def challenge(self, key=None):
+        if not key:
+            if self.detect_key():
+                key = self.key
+            else:
+                errmsg = _("AdsCaptcha key not found")
+                self.plugin.fail(errmsg)
+                raise TypeError(errmsg)
+
+        PublicKey, CaptchaId = key
+
+        html = self.plugin.req.load("http://api.adscaptcha.com/Get.aspx", get={'CaptchaId': CaptchaId, 'PublicKey': PublicKey})
+        try:
+            challenge = re.search("challenge: '(.+?)',", html).group(1)
+            server    = re.search("server: '(.+?)',", html).group(1)
+        except:
+            errmsg = _("AdsCaptcha challenge pattern not found")
+            self.plugin.fail(errmsg)
+            raise ValueError(errmsg)
+
+        self.plugin.logDebug("AdsCaptcha challenge: %s" % challenge)
+
+        return challenge, self.result(server, challenge)
+
+
+    def result(self, server, challenge):
+        result = self.plugin.decryptCaptcha("%sChallenge.aspx" % server,
+                                            get={'cid': challenge, 'dummy': random()},
+                                            cookies=True,
+                                            imgtype="jpg")
+
+        self.plugin.logDebug("AdsCaptcha result: %s" % result)
+
+        return result
+
+
+class SolveMedia(CaptchaService):
+    __name__    = "SolveMedia"
+    __version__ = "0.06"
+
+    __description__ = """SolveMedia captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("pyLoad Team", "admin@pyload.org")]
+
+
+    KEY_PATTERN = r'api\.solvemedia\.com/papi/challenge\.(?:no)?script\?k=(.+?)["\']'
+
+
+    def challenge(self, key=None):
+        if not key:
+            if self.detect_key():
+                key = self.key
+            else:
+                errmsg = _("SolveMedia key not found")
+                self.plugin.fail(errmsg)
+                raise TypeError(errmsg)
+
+        html = self.plugin.req.load("http://api.solvemedia.com/papi/challenge.noscript", get={'k': key})
+        try:
+            challenge = re.search(r'<input type=hidden name="adcopy_challenge" id="adcopy_challenge" value="([^"]+)">',
+                                  html).group(1)
+            server    = "http://api.solvemedia.com/papi/media"
+        except:
+            errmsg = _("SolveMedia challenge pattern not found")
+            self.plugin.fail(errmsg)
+            raise ValueError(errmsg)
+
+        self.plugin.logDebug("SolveMedia challenge: %s" % challenge)
+
+        return challenge, self.result(server, challenge)
+
+
+    def result(self, server, challenge):
+        result = self.plugin.decryptCaptcha(server, get={'c': challenge}, imgtype="gif")
+
+        self.plugin.logDebug("SolveMedia result: %s" % result)
+
+        return result
+
+
+class AdYouLike(CaptchaService):
+    __name__    = "AdYouLike"
+    __version__ = "0.02"
+
+    __description__ = """AdYouLike captcha service plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    AYL_PATTERN      = r'Adyoulike\.create\s*\((.+?)\)'
+    CALLBACK_PATTERN = r'(Adyoulike\.g\._jsonp_\d+)'
+
+
+    def detect_key(self, html=None):
+        if not html:
+            if hasattr(self.plugin, "html") and self.plugin.html:
+                html = self.plugin.html
+            else:
+                errmsg = _("AdYouLike html not found")
+                self.plugin.fail(errmsg)
+                raise TypeError(errmsg)
+
+        m = re.search(self.AYL_PATTERN, html)
+        n = re.search(self.CALLBACK_PATTERN, html)
+        if m and n:
+            self.key = (m.group(1).strip(), n.group(1).strip())
+            self.plugin.logDebug("AdYouLike ayl|callback: %s | %s" % self.key)
+            return self.key   #: key is the tuple(ayl, callback)
+        else:
+            self.plugin.logDebug("AdYouLike ayl or callback not found")
+            return None
+
+
+    def challenge(self, key=None):
+        if not key:
+            if self.detect_key():
+                key = self.key
+            else:
+                errmsg = _("AdYouLike key not found")
+                self.plugin.fail(errmsg)
+                raise TypeError(errmsg)
+
+        ayl, callback = key
+
+        # {"adyoulike":{"key":"P~zQ~O0zV0WTiAzC-iw0navWQpCLoYEP"},
+        # "all":{"element_id":"ayl_private_cap_92300","lang":"fr","env":"prod"}}
+        ayl = json_loads(ayl)
+
+        html = self.plugin.req.load("http://api-ayl.appspot.com/challenge",
+                                    get={'key'     : ayl['adyoulike']['key'],
+                                         'env'     : ayl['all']['env'],
+                                         'callback': callback})
+        try:
+            challenge = json_loads(re.search(callback + r'\s*\((.+?)\)', html).group(1))
+        except:
+            errmsg = _("AdYouLike challenge pattern not found")
+            self.plugin.fail(errmsg)
+            raise ValueError(errmsg)
+
+        self.plugin.logDebug("AdYouLike challenge: %s" % challenge)
+
+        return self.result(ayl, challenge)
+
+
+    def result(self, server, challenge):
+        # Adyoulike.g._jsonp_5579316662423138
+        # ({"translations":{"fr":{"instructions_visual":"Recopiez « Soonnight » ci-dessous :"}},
+        # "site_under":true,"clickable":true,"pixels":{"VIDEO_050":[],"DISPLAY":[],"VIDEO_000":[],"VIDEO_100":[],
+        # "VIDEO_025":[],"VIDEO_075":[]},"medium_type":"image/adyoulike",
+        # "iframes":{"big":"<iframe src=\"http://www.soonnight.com/campagn.html\" scrolling=\"no\"
+        # height=\"250\" width=\"300\" frameborder=\"0\"></iframe>"},"shares":{},"id":256,
+        # "token":"e6QuI4aRSnbIZJg02IsV6cp4JQ9~MjA1","formats":{"small":{"y":300,"x":0,"w":300,"h":60},
+        # "big":{"y":0,"x":0,"w":300,"h":250},"hover":{"y":440,"x":0,"w":300,"h":60}},
+        # "tid":"SqwuAdxT1EZoi4B5q0T63LN2AkiCJBg5"})
+
+        if isinstance(server, basestring):
+            server = json_loads(server)
+
+        if isinstance(challenge, basestring):
+            challenge = json_loads(challenge)
+
+        try:
+            instructions_visual = challenge['translations'][server['all']['lang']]['instructions_visual']
+            result = re.search(u'«(.+?)»', instructions_visual).group(1).strip()
+        except:
+            errmsg = _("AdYouLike result not found")
+            self.plugin.fail(errmsg)
+            raise ValueError(errmsg)
+
+        result = {'_ayl_captcha_engine' : "adyoulike",
+                  '_ayl_env'            : server['all']['env'],
+                  '_ayl_tid'            : challenge['tid'],
+                  '_ayl_token_challenge': challenge['token'],
+                  '_ayl_response'       : response}
+
+        self.plugin.logDebug("AdYouLike result: %s" % result)
+
+        return result