Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/captcha/OCR.py
	module/plugins/captcha/captcha.py
	module/plugins/crypter/DailymotionBatch.py
	module/plugins/crypter/DailymotionComFolder.py
	module/plugins/crypter/YoutubeBatch.py
	module/plugins/crypter/YoutubeComFolder.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/Extractor.py
	pyload/plugin/OCR.py
	pyload/plugin/account/DebridItaliaCom.py
	pyload/plugin/account/MegaRapidCz.py
	pyload/plugin/account/NoPremiumPl.py
	pyload/plugin/account/RapideoPl.py
	pyload/plugin/addon/AndroidPhoneNotify.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/DeleteFinished.py
	pyload/plugin/addon/DownloadScheduler.py
	pyload/plugin/addon/ExternalScripts.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/addon/IRCInterface.py
	pyload/plugin/addon/JustPremium.py
	pyload/plugin/addon/MergeFiles.py
	pyload/plugin/addon/MultiHome.py
	pyload/plugin/addon/RestartFailed.py
	pyload/plugin/addon/RestartSlow.py
	pyload/plugin/addon/SkipRev.py
	pyload/plugin/addon/UnSkipOnFail.py
	pyload/plugin/addon/UpdateManager.py
	pyload/plugin/addon/WindowsPhoneNotify.py
	pyload/plugin/crypter/DDLMusicOrg.py
	pyload/plugin/crypter/DailymotionBatch.py
	pyload/plugin/crypter/DevhostSt.py
	pyload/plugin/crypter/EmbeduploadCom.py
	pyload/plugin/crypter/MultiloadCz.py
	pyload/plugin/crypter/YoutubeBatch.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/Captcha9Kw.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/DeathByCaptcha.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/AlldebridCom.py
	pyload/plugin/hoster/CzshareCom.py
	pyload/plugin/hoster/EuroshareEu.py
	pyload/plugin/hoster/FastixRu.py
	pyload/plugin/hoster/FastshareCz.py
	pyload/plugin/hoster/GooIm.py
	pyload/plugin/hoster/MediafireCom.py
	pyload/plugin/hoster/MegaDebridEu.py
	pyload/plugin/hoster/NitroflareCom.py
	pyload/plugin/hoster/OverLoadMe.py
	pyload/plugin/hoster/PremiumTo.py
	pyload/plugin/hoster/PremiumizeMe.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RealdebridCom.py
	pyload/plugin/hoster/SimplyPremiumCom.py
	pyload/plugin/hoster/SimplydebridCom.py
	pyload/plugin/hoster/SmoozedCom.py
	pyload/plugin/hoster/SoundcloudCom.py
	pyload/plugin/hoster/UlozTo.py
	pyload/plugin/hoster/UploadableCh.py
	pyload/plugin/hoster/UploadedTo.py
	pyload/plugin/hoster/UploadheroCom.py
	pyload/plugin/hoster/VeehdCom.py
	pyload/plugin/hoster/VimeoCom.py
	pyload/plugin/hoster/ZeveraCom.py
	pyload/plugin/hoster/ZippyshareCom.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/MultiHoster.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSHoster.py
	pyload/plugin/ocr/GigasizeCom.py
	pyload/plugin/ocr/LinksaveIn.py
	pyload/plugin/ocr/NetloadIn.py
	pyload/plugin/ocr/ShareonlineBiz.py

1 files changed, 34 insertions, 31 deletions

diff --git a/pyload/plugin/addon/ClickAndLoad.py b/pyload/plugin/addon/ClickAndLoad.py
index 728580cac..63647e30a 100644
--- a/pyload/plugin/addon/ClickAndLoad.py
+++ b/pyload/plugin/addon/ClickAndLoad.py
@@ -17,30 +17,34 @@ def forward(source, destination):
             bufdata = source.recv(bufsize)
     finally:
         destination.shutdown(socket.SHUT_WR)
+        # destination.close()
 
 
 #@TODO: IPv6 support
 class ClickAndLoad(Addon):
     __name__    = "ClickAndLoad"
     __type__    = "addon"
-    __version__ = "0.37"
+    __version__ = "0.41"
 
     __config__ = [("activated", "bool", "Activated"                             , True),
-                ("port"     , "int" , "Port"                                  , 9666),
-                ("extern"   , "bool", "Listen on the public network interface", True)]
+                  ("port"     , "int" , "Port"                                  , 9666),
+                  ("extern"   , "bool", "Listen on the public network interface", True)]
 
-    __description__ = """Click'N'Load addon plugin"""
+    __description__ = """Click'n'Load hook plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("RaNaN", "RaNaN@pyload.de"),
+    __authors__     = [("RaNaN"         , "RaNaN@pyload.de"  ),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
+    interval = 0  #@TODO: Remove in 0.4.10
+
+
     def activate(self):
         if not self.config['webinterface']['activated']:
             return
 
-        ip      = "" if self.getConfig("extern") else "127.0.0.1"
-        webport = int(self.config['webinterface']['port'])
+        ip      = "" if self.getConfig('extern') else "127.0.0.1"
+        webport = self.config['webinterface']['port']
         cnlport = self.getConfig('port')
 
         self.proxy(ip, webport, cnlport)
@@ -48,40 +52,39 @@ class ClickAndLoad(Addon):
 
     @threaded
     def proxy(self, ip, webport, cnlport):
-        self.logInfo(_("Proxy listening on %s:%s") % (ip, cnlport))
-        self.manager.startThread(self._server, ip, webport, cnlport)
+        time.sleep(10)  #@TODO: Remove in 0.4.10 (implement addon delay on startup)
+
+        self.logInfo(_("Proxy listening on %s:%s") % (ip or "0.0.0.0", cnlport))
+
+        self._server(ip, webport, cnlport)
+
         lock = Lock()
         lock.acquire()
         lock.acquire()
 
 
-    def _server(self, ip, webport, cnlport, thread):
+    @threaded
+    def _server(self, ip, webport, cnlport):
         try:
-            try:
-                server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-
-                server_socket.bind((ip, cnlport))
-                server_socket.listen(5)
+            dock_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            dock_socket.bind((ip, cnlport))
+            dock_socket.listen(5)
 
-                while True:
-                    client_socket = server_socket.accept()[0]
-                    dock_socket   = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            while True:
+                client_socket, client_addr = dock_socket.accept()
+                self.logDebug("Connection from %s:%s" % client_addr)
 
-                    dock_socket.connect(("127.0.0.1", webport))
-
-                    self.manager.startThread(forward, dock_socket, client_socket)
-                    self.manager.startThread(forward, client_socket, dock_socket)
+                server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                server_socket.connect(("127.0.0.1", webport))
 
-            except socket.timeout:
-                self.logDebug("Connection timed out, retrying...")
-                return self._server(ip, webport, cnlport, thread)
+                self.manager.startThread(forward, client_socket, server_socket)
+                self.manager.startThread(forward, server_socket, client_socket)
 
-            finally:
-                server_socket.close()
-                client_socket.close()
-                dock_socket.close()
+        except socket.timeout:
+            self.logDebug("Connection timed out, retrying...")
+            return self._server(ip, webport, cnlport)
 
         except socket.error, e:
             self.logError(e)
-            time.sleep(120)
-            self._server(ip, webport, cnlport, thread)
+            time.sleep(240)
+            return self._server(ip, webport, cnlport)