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, 32 insertions, 19 deletions

diff --git a/module/plugins/hoster/LetitbitNet.py b/module/plugins/hoster/LetitbitNet.py
index f6ec6fb34..2c725427d 100644
--- a/module/plugins/hoster/LetitbitNet.py
+++ b/module/plugins/hoster/LetitbitNet.py
@@ -8,25 +8,24 @@
 
 import re
 
-from urllib import urlencode, urlopen
 from urlparse import urljoin
 
-from pyload.utils import json_loads, json_dumps
-from pyload.plugin.hoster.UnrestrictLi import secondsToMidnight
-from pyload.plugin.internal.captcha import ReCaptcha
-from pyload.plugin.internal.SimpleHoster import SimpleHoster
+from module.common.json_layer import json_loads, json_dumps
+from module.network.RequestFactory import getURL
+from module.plugins.internal.CaptchaService import ReCaptcha
+from module.plugins.internal.SimpleHoster import SimpleHoster, secondsToMidnight
 
 
-def api_download_info(url):
+def api_response(url):
     json_data = ["yw7XQy2v9", ["download/info", {"link": url}]]
-    post_data = urlencode({'r': json_dumps(json_data)})
-    api_rep = urlopen("http://api.letitbit.net/json", data=post_data).read()
+    api_rep   = getURL("http://api.letitbit.net/json",
+                       post={'r': json_dumps(json_data)})
     return json_loads(api_rep)
 
 
 def getInfo(urls):
     for url in urls:
-        api_rep = api_download_info(url)
+        api_rep = api_response(url)
         if api_rep['status'] == 'OK':
             info = api_rep['data'][0]
             yield (info['name'], info['size'], 2, url)
@@ -37,9 +36,9 @@ def getInfo(urls):
 class LetitbitNet(SimpleHoster):
     __name__    = "LetitbitNet"
     __type__    = "hoster"
-    __version__ = "0.26"
+    __version__ = "0.30"
 
-    __pattern__ = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.*'
+    __pattern__ = r'https?://(?:www\.)?(letitbit|shareflare)\.net/download/.+'
 
     __description__ = """Letitbit.net hoster plugin"""
     __license__     = "GPLv3"
@@ -50,7 +49,7 @@ class LetitbitNet(SimpleHoster):
     URL_REPLACEMENTS = [(r"(?<=http://)([^/]+)", "letitbit.net")]
 
     SECONDS_PATTERN = r'seconds\s*=\s*(\d+);'
-    CAPTCHA_CONTROL_FIELD = r'recaptcha_control_field\s=\s\'(?P<value>.+?)\''
+    CAPTCHA_CONTROL_FIELD = r'recaptcha_control_field\s=\s\'(.+?)\''
 
 
     def setup(self):
@@ -58,7 +57,7 @@ class LetitbitNet(SimpleHoster):
 
 
     def getFileInfo(self):
-        api_rep = api_download_info(self.pyfile.url)
+        api_rep = api_response(self.pyfile.url)
         if api_rep['status'] == 'OK':
             self.api_data = api_rep['data'][0]
             self.pyfile.name = self.api_data['name']
@@ -67,12 +66,12 @@ class LetitbitNet(SimpleHoster):
             self.offline()
 
 
-    def handleFree(self):
+    def handleFree(self, pyfile):
         action, inputs = self.parseHtmlForm('id="ifree_form"')
         if not action:
             self.error(_("ifree_form"))
 
-        self.pyfile.size = float(inputs['sssize'])
+        pyfile.size = float(inputs['sssize'])
         self.logDebug(action, inputs)
         inputs['desc'] = ""
 
@@ -80,38 +79,52 @@ class LetitbitNet(SimpleHoster):
 
         m = re.search(self.SECONDS_PATTERN, self.html)
         seconds = int(m.group(1)) if m else 60
+
         self.logDebug("Seconds found", seconds)
+
         m = re.search(self.CAPTCHA_CONTROL_FIELD, self.html)
         recaptcha_control_field = m.group(1)
+
         self.logDebug("ReCaptcha control field found", recaptcha_control_field)
+
         self.wait(seconds)
 
         res = self.load("http://letitbit.net/ajax/download3.php", post=" ", cookies=True)
         if res != '1':
             self.error(_("Unknown response - ajax_check_url"))
+
         self.logDebug(res)
 
         recaptcha = ReCaptcha(self)
-        challenge, response = recaptcha.challenge()
+        response, challenge = recaptcha.challenge()
 
         post_data = {"recaptcha_challenge_field": challenge,
                      "recaptcha_response_field": response,
                      "recaptcha_control_field": recaptcha_control_field}
+
         self.logDebug("Post data to send", post_data)
+
         res = self.load("http://letitbit.net/ajax/check_recaptcha.php", post=post_data, cookies=True)
+
         self.logDebug(res)
+
         if not res:
             self.invalidCaptcha()
+
         if res == "error_free_download_blocked":
             self.logWarning(_("Daily limit reached"))
             self.wait(secondsToMidnight(gmt=2), True)
+
         if res == "error_wrong_captcha":
             self.invalidCaptcha()
             self.retry()
+
         elif res.startswith('['):
             urls = json_loads(res)
+
         elif res.startswith('http://'):
             urls = [res]
+
         else:
             self.error(_("Unknown response - captcha check"))
 
@@ -127,11 +140,11 @@ class LetitbitNet(SimpleHoster):
             self.fail(_("Download did not finish correctly"))
 
 
-    def handlePremium(self):
+    def handlePremium(self, pyfile):
         api_key = self.user
         premium_key = self.account.getAccountData(self.user)['password']
 
-        json_data = [api_key, ["download/direct_links", {"pass": premium_key, "link": self.pyfile.url}]]
+        json_data = [api_key, ["download/direct_links", {"pass": premium_key, "link": pyfile.url}]]
         api_rep = self.load('http://api.letitbit.net/json', post={'r': json_dumps(json_data)})
         self.logDebug("API Data: " + api_rep)
         api_rep = json_loads(api_rep)
@@ -139,4 +152,4 @@ class LetitbitNet(SimpleHoster):
         if api_rep['status'] == 'FAIL':
             self.fail(api_rep['data'])
 
-        self.download(api_rep['data'][0][0], disposition=True)
+        self.link = api_rep['data'][0][0]