Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/OCR.py
	module/plugins/accounts/BayfilesCom.py
	module/plugins/accounts/CatShareNet.py
	module/plugins/accounts/DebridItaliaCom.py
	module/plugins/accounts/FourSharedCom.py
	module/plugins/accounts/FshareVn.py
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/accounts/LomafileCom.py
	module/plugins/accounts/RapiduNet.py
	module/plugins/accounts/RyushareCom.py
	module/plugins/accounts/ShareonlineBiz.py
	module/plugins/addon/Checksum.py
	module/plugins/addon/ExternalScripts.py
	module/plugins/addon/ExtractArchive.py
	module/plugins/addon/MergeFiles.py
	module/plugins/addon/RestartSlow.py
	module/plugins/addon/SkipRev.py
	module/plugins/addon/UnSkipOnFail.py
	module/plugins/addon/UpdateManager.py
	module/plugins/addon/WindowsPhoneToastNotify.py
	module/plugins/container/CCF.py
	module/plugins/container/LinkList.py
	module/plugins/container/RSDF.py
	module/plugins/crypter/BitshareCom.py
	module/plugins/crypter/CrockoCom.py
	module/plugins/crypter/DataHu.py
	module/plugins/crypter/DepositfilesCom.py
	module/plugins/crypter/Dereferer.py
	module/plugins/crypter/DevhostStFolder.py
	module/plugins/crypter/DlProtectCom.py
	module/plugins/crypter/DontKnowMe.py
	module/plugins/crypter/EasybytezCom.py
	module/plugins/crypter/FilecloudIo.py
	module/plugins/crypter/FilecryptCc.py
	module/plugins/crypter/FilefactoryCom.py
	module/plugins/crypter/FilerNet.py
	module/plugins/crypter/FilestubeCom.py
	module/plugins/crypter/FiletramCom.py
	module/plugins/crypter/FreakhareCom.py
	module/plugins/crypter/FreetexthostCom.py
	module/plugins/crypter/FshareVn.py
	module/plugins/crypter/ImgurComAlbum.py
	module/plugins/crypter/JunocloudMe.py
	module/plugins/crypter/LinkSaveIn.py
	module/plugins/crypter/MegaRapidCz.py
	module/plugins/crypter/MultiUpOrg.py
	module/plugins/crypter/NetfolderIn.py
	module/plugins/crypter/NosvideoCom.py
	module/plugins/crypter/OneKhDe.py
	module/plugins/crypter/PastebinCom.py
	module/plugins/crypter/RapidfileshareNet.py
	module/plugins/crypter/RelinkUs.py
	module/plugins/crypter/TnyCz.py
	module/plugins/crypter/TurbobitNet.py
	module/plugins/crypter/TusfilesNet.py
	module/plugins/crypter/UploadableCh.py
	module/plugins/crypter/UploadedTo.py
	module/plugins/crypter/XFileSharingPro.py
	module/plugins/hooks/AlldebridCom.py
	module/plugins/hooks/BypassCaptcha.py
	module/plugins/hooks/Captcha9Kw.py
	module/plugins/hooks/CaptchaBrotherhood.py
	module/plugins/hooks/ClickAndLoad.py
	module/plugins/hooks/DeathByCaptcha.py
	module/plugins/hooks/DebridItaliaCom.py
	module/plugins/hooks/EasybytezCom.py
	module/plugins/hooks/ExpertDecoders.py
	module/plugins/hooks/FastixRu.py
	module/plugins/hooks/FreeWayMe.py
	module/plugins/hooks/ImageTyperz.py
	module/plugins/hooks/LinkdecrypterCom.py
	module/plugins/hooks/LinksnappyCom.py
	module/plugins/hooks/MegaDebridEu.py
	module/plugins/hooks/MultishareCz.py
	module/plugins/hooks/MyfastfileCom.py
	module/plugins/hooks/OverLoadMe.py
	module/plugins/hooks/PremiumTo.py
	module/plugins/hooks/PremiumizeMe.py
	module/plugins/hooks/RPNetBiz.py
	module/plugins/hooks/RealdebridCom.py
	module/plugins/hooks/RehostTo.py
	module/plugins/hooks/SimplyPremiumCom.py
	module/plugins/hooks/SimplydebridCom.py
	module/plugins/hooks/UnrestrictLi.py
	module/plugins/hooks/XFileSharingPro.py
	module/plugins/hooks/ZeveraCom.py
	module/plugins/hoster/AlldebridCom.py
	module/plugins/hoster/BayfilesCom.py
	module/plugins/hoster/DebridItaliaCom.py
	module/plugins/hoster/DepositfilesCom.py
	module/plugins/hoster/DodanePl.py
	module/plugins/hoster/ExtabitCom.py
	module/plugins/hoster/FastixRu.py
	module/plugins/hoster/FastshareCz.py
	module/plugins/hoster/FileParadoxIn.py
	module/plugins/hoster/FileSharkPl.py
	module/plugins/hoster/FilerNet.py
	module/plugins/hoster/FileserveCom.py
	module/plugins/hoster/FreakshareCom.py
	module/plugins/hoster/FreeWayMe.py
	module/plugins/hoster/GigapetaCom.py
	module/plugins/hoster/IfileIt.py
	module/plugins/hoster/Keep2ShareCc.py
	module/plugins/hoster/LetitbitNet.py
	module/plugins/hoster/LinksnappyCom.py
	module/plugins/hoster/LomafileCom.py
	module/plugins/hoster/MegaCoNz.py
	module/plugins/hoster/MegaDebridEu.py
	module/plugins/hoster/MegaRapidCz.py
	module/plugins/hoster/MyfastfileCom.py
	module/plugins/hoster/OverLoadMe.py
	module/plugins/hoster/PremiumTo.py
	module/plugins/hoster/PremiumizeMe.py
	module/plugins/hoster/RPNetBiz.py
	module/plugins/hoster/RapidgatorNet.py
	module/plugins/hoster/RealdebridCom.py
	module/plugins/hoster/RehostTo.py
	module/plugins/hoster/RyushareCom.py
	module/plugins/hoster/SendmywayCom.py
	module/plugins/hoster/ShareonlineBiz.py
	module/plugins/hoster/SimplyPremiumCom.py
	module/plugins/hoster/SimplydebridCom.py
	module/plugins/hoster/TusfilesNet.py
	module/plugins/hoster/UnibytesCom.py
	module/plugins/hoster/UnrestrictLi.py
	module/plugins/hoster/UploadedTo.py
	module/plugins/hoster/WebshareCz.py
	module/plugins/hoster/XFileSharingPro.py
	module/plugins/hoster/YoutubeCom.py
	module/plugins/hoster/ZeveraCom.py
	module/plugins/hoster/ZippyshareCom.py
	module/plugins/internal/AbstractExtractor.py
	module/plugins/internal/BasePlugin.py
	module/plugins/internal/CaptchaService.py
	module/plugins/internal/DeadCrypter.py
	module/plugins/internal/DeadHoster.py
	module/plugins/internal/MultiHoster.py
	module/plugins/internal/SimpleCrypter.py
	module/plugins/internal/SimpleHoster.py
	module/plugins/internal/UnRar.py
	module/plugins/internal/UnZip.py
	module/plugins/internal/XFSCrypter.py
	module/plugins/internal/XFSHoster.py

1 files changed, 124 insertions, 0 deletions

diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py
new file mode 100644
index 000000000..8b53872e4
--- /dev/null
+++ b/module/plugins/hooks/ClickAndLoad.py
@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+
+import socket
+
+from threading import Lock
+
+from module.plugins.Hook import Hook, threaded
+
+
+def forward(source, destination):
+    try:
+        bufsize = 1024
+        bufdata = source.recv(bufsize)
+        while bufdata:
+            destination.sendall(bufdata)
+            bufdata = source.recv(bufsize)
+    finally:
+        destination.shutdown(socket.SHUT_WR)
+
+
+#: create_connection wrapper for python 2.5 socket module
+def create_connection(address, timeout=object(), source_address=None):
+    if hasattr(socket, 'create_connection'):
+        if type(timeout) == object:
+            timeout = socket._GLOBAL_DEFAULT_TIMEOUT
+
+        return socket.create_connection(address, timeout, source_address)
+
+    else:
+        host, port = address
+        err = None
+        for res in getaddrinfo(host, port, 0, SOCK_STREAM):
+            af, socktype, proto, canonname, sa = res
+            sock = None
+            try:
+                sock = socket(af, socktype, proto)
+                if type(timeout) != object:
+                    sock.settimeout(timeout)
+                if source_address:
+                    sock.bind(source_address)
+                sock.connect(sa)
+                return sock
+
+            except socket.error, _:
+                err = _
+                if sock is not None:
+                    sock.close()
+
+        if err is not None:
+            raise err
+        else:
+            raise socket.error("getaddrinfo returns an empty list")
+
+
+class ClickAndLoad(Hook):
+    __name__    = "ClickAndLoad"
+    __type__    = "hook"
+    __version__ = "0.35"
+
+    __config__ = [("activated", "bool", "Activated"                             , True),
+                  ("port"     , "int" , "Port"                                  , 9666),
+                  ("extern"   , "bool", "Listen on the public network interface", True)]
+
+    __description__ = """Click'N'Load hook plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.de"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    #@TODO: Remove in 0.4.10
+    def initPeriodical(self):
+        pass
+
+
+    def coreReady(self):
+        if not self.config['webinterface']['activated']:
+            return
+
+        ip      = socket.gethostbyname(socket.gethostname()) if self.getConfig("extern") else "127.0.0.1"
+        webport = int(self.config['webinterface']['port'])
+        cnlport = self.getConfig('port')
+
+        self.proxy(ip, webport, cnlport)
+
+
+    @threaded
+    def proxy(self, ip, webport, cnlport):
+        self.manager.startThread(self._server, ip, webport, cnlport)
+        lock = Lock()
+        lock.acquire()
+        lock.acquire()
+
+
+    def _server(self, ip, webport, cnlport, thread):
+        try:
+            server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            server_socket.bind((ip, cnlport))
+            server_socket.listen(5)
+
+            while True:
+                client_socket = server_socket.accept()[0]
+                dock_socket   = create_connection(("127.0.0.1", webport))
+
+                self.manager.startThread(forward, dock_socket, client_socket)
+                self.manager.startThread(forward, client_socket, dock_socket)
+
+        except socket.error, e:
+            self.logDebug(e)
+            self._server(ip, webport, cnlport, thread)
+
+        except Exception, e:
+            self.logError(e)
+
+            try:
+                client_socket.close()
+                dock_socket.close()
+            except Exception:
+                pass
+
+            try:
+                server_socket.close()
+            except Exception:
+                pass