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, 31 insertions, 51 deletions

diff --git a/module/plugins/hoster/Keep2ShareCc.py b/module/plugins/hoster/Keep2ShareCc.py
index 8f8e8cb67..3ed11aa13 100644
--- a/module/plugins/hoster/Keep2ShareCc.py
+++ b/module/plugins/hoster/Keep2ShareCc.py
@@ -2,20 +2,20 @@
 
 import re
 
-from urlparse import urljoin, urlparse
+from urlparse import urljoin
 
-from pyload.plugin.internal.captcha import ReCaptcha
-from pyload.plugin.internal.SimpleHoster import _isDirectLink, SimpleHoster, create_getInfo
+from module.plugins.internal.CaptchaService import ReCaptcha
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
-class Keep2shareCc(SimpleHoster):
-    __name__    = "Keep2shareCc"
+class Keep2ShareCc(SimpleHoster):
+    __name__    = "Keep2ShareCc"
     __type__    = "hoster"
-    __version__ = "0.17"
+    __version__ = "0.21"
 
     __pattern__ = r'https?://(?:www\.)?(keep2share|k2s|keep2s)\.cc/file/(?P<ID>\w+)'
 
-    __description__ = """Keep2share.cc hoster plugin"""
+    __description__ = """Keep2Share.cc hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
@@ -29,7 +29,8 @@ class Keep2shareCc(SimpleHoster):
     OFFLINE_PATTERN      = r'File not found or deleted|Sorry, this file is blocked or deleted|Error 404'
     TEMP_OFFLINE_PATTERN = r'Downloading blocked due to'
 
-    LINK_FREE_PATTERN = LINK_PREMIUM_PATTERN = r'"([^"]+url.html?file=.+?)"|window\.location\.href = \'(.+?)\';'
+    LINK_FREE_PATTERN    = r'"([^"]+url.html?file=.+?)"|window\.location\.href = \'(.+?)\';'
+    LINK_PREMIUM_PATTERN = r'window\.location\.href = \'(.+?)\';'
 
     CAPTCHA_PATTERN = r'src="(/file/captcha\.html.+?)"'
 
@@ -56,7 +57,7 @@ class Keep2shareCc(SimpleHoster):
 
             # string to time convert courtesy of https://stackoverflow.com/questions/10663720
             ftr = [3600, 60, 1]
-            wait_time = sum([a * b for a, b in zip(ftr, map(int, m.group(1).split(':')))])
+            wait_time = sum(a * b for a, b in zip(ftr, map(int, m.group(1).split(':'))))
 
             self.wantReconnect = True
             self.retry(wait_time=wait_time, reason="Please wait to download this file")
@@ -64,9 +65,9 @@ class Keep2shareCc(SimpleHoster):
         self.info.pop('error', None)
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         self.fid  = re.search(r'<input type="hidden" name="slow_id" value="([^"]+)">', self.html).group(1)
-        self.html = self.load(self.pyfile.url, post={'yt0': '', 'slow_id': self.fid})
+        self.html = self.load(pyfile.url, post={'yt0': '', 'slow_id': self.fid})
 
         self.checkErrors()
 
@@ -77,56 +78,35 @@ class Keep2shareCc(SimpleHoster):
 
             self.wait(30)
 
-            self.html = self.load(self.pyfile.url, post={'uniqueId': self.fid, 'free': 1})
-
-            self.checkErrors()
+            self.html = self.load(pyfile.url)
 
             m = re.search(self.LINK_FREE_PATTERN, self.html)
             if m is None:
-                self.error(_("LINK_FREE_PATTERN not found"))
+                self.error(_("Free download link not found"))
 
         self.link = m.group(1)
-
-
     def handleCaptcha(self):
         recaptcha = ReCaptcha(self)
+        post_data = {'free'               : 1,
+                     'freeDownloadRequest': 1,
+                     'uniqueId'           : self.fid,
+                     'yt0'                : ''}
 
-        for _i in xrange(5):
-            post_data = {'free'               : 1,
-                         'freeDownloadRequest': 1,
-                         'uniqueId'           : self.fid,
-                         'yt0'                : ''}
-
-            m = re.search(self.CAPTCHA_PATTERN, self.html)
-            if m:
-                captcha_url = urljoin(self.base, m.group(1))
-                post_data['CaptchaForm[code]'] = self.decryptCaptcha(captcha_url)
-            else:
-                challenge, response = recaptcha.challenge()
-                post_data.update({'recaptcha_challenge_field': challenge,
-                                  'recaptcha_response_field' : response})
-
-            self.html = self.load(self.pyfile.url, post=post_data)
-
-            if 'recaptcha' not in self.html:
-                self.correctCaptcha()
-                break
-            else:
-                self.invalidCaptcha()
+        m = re.search(self.CAPTCHA_PATTERN, self.html)
+        if m:
+            captcha_url = urljoin("http://k2s.cc/", m.group(1))
+            post_data['CaptchaForm[code]'] = self.decryptCaptcha(captcha_url)
         else:
-            self.fail(_("All captcha attempts failed"))
+            response, challenge = recaptcha.challenge()
+            post_data.update({'recaptcha_challenge_field': challenge,
+                              'recaptcha_response_field' : response})
 
+        self.html = self.load(self.pyfile.url, post=post_data)
 
-    def downloadLink(self, link):
-        if not link:
-            return
-
-        p    = urlparse(self.pyfile.url)
-        base = "%s://%s" % (p.scheme, p.netloc)
-        link = _isDirectLink(self, link, self.premium)
-
-        if link:
-            self.download(urljoin(base, link), disposition=True)
+        if 'verification code is incorrect' not in self.html:
+            self.correctCaptcha()
+        else:
+            self.invalidCaptcha()
 
 
-getInfo = create_getInfo(Keep2shareCc)
+getInfo = create_getInfo(Keep2ShareCc)