Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/MegaRapidCz.py
	module/plugins/accounts/ShareRapidCom.py
	module/plugins/crypter/HotfileComFolder.py
	module/plugins/crypter/HotfileFolderCom.py
	module/plugins/hoster/Keep2shareCC.py
	module/plugins/hoster/Keep2shareCc.py
	module/plugins/hoster/MegaCoNz.py
	module/plugins/hoster/MegaNz.py
	module/plugins/hoster/MegaRapidCz.py
	module/plugins/hoster/ShareRapidCom.py
	module/plugins/internal/CaptchaService.py
	pyload/api/__init__.py
	pyload/manager/AccountManager.py
	pyload/manager/PluginManager.py
	pyload/manager/thread/PluginThread.py
	pyload/network/HTTPRequest.py
	pyload/network/XDCCRequest.py
	pyload/plugins/Plugin.py
	pyload/plugins/account/BillionuploadsCom.py
	pyload/plugins/account/CramitIn.py
	pyload/plugins/account/EasybytezCom.py
	pyload/plugins/account/FastshareCz.py
	pyload/plugins/account/File4safeCom.py
	pyload/plugins/account/FileParadoxIn.py
	pyload/plugins/account/FileomCom.py
	pyload/plugins/account/FilerNet.py
	pyload/plugins/account/FilerioCom.py
	pyload/plugins/account/FourSharedCom.py
	pyload/plugins/account/Ftp.py
	pyload/plugins/account/Http.py
	pyload/plugins/account/HugefilesNet.py
	pyload/plugins/account/HundredEightyUploadCom.py
	pyload/plugins/account/LomafileCom.py
	pyload/plugins/account/MovReelCom.py
	pyload/plugins/account/MultishareCz.py
	pyload/plugins/account/MyfastfileCom.py
	pyload/plugins/account/NosuploadCom.py
	pyload/plugins/account/NovafileCom.py
	pyload/plugins/account/QuickshareCz.py
	pyload/plugins/account/RarefileNet.py
	pyload/plugins/account/RyushareCom.py
	pyload/plugins/account/SecureUploadEu.py
	pyload/plugins/account/SendmywayCom.py
	pyload/plugins/account/ShareRapidCom.py
	pyload/plugins/account/StahnuTo.py
	pyload/plugins/account/StreamcloudEu.py
	pyload/plugins/account/TusfilesNet.py
	pyload/plugins/account/UploadingCom.py
	pyload/plugins/account/UptoboxCom.py
	pyload/plugins/account/VidPlayNet.py
	pyload/plugins/addon/Checksum.py
	pyload/plugins/addon/ClickAndLoad.py
	pyload/plugins/addon/DeleteFinished.py
	pyload/plugins/addon/DownloadScheduler.py
	pyload/plugins/addon/ExternalScripts.py
	pyload/plugins/addon/ExtractArchive.py
	pyload/plugins/addon/HotFolder.py
	pyload/plugins/addon/IRCInterface.py
	pyload/plugins/addon/MergeFiles.py
	pyload/plugins/addon/MultiHome.py
	pyload/plugins/addon/RestartFailed.py
	pyload/plugins/addon/UnSkipOnFail.py
	pyload/plugins/addon/WindowsPhoneToastNotify.py
	pyload/plugins/addon/XMPPInterface.py
	pyload/plugins/base/Container.py
	pyload/plugins/base/Crypter.py
	pyload/plugins/base/Hook.py
	pyload/plugins/base/OCR.py
	pyload/plugins/container/RSDF.py
	pyload/plugins/crypter/DuploadOrgFolder.py
	pyload/plugins/crypter/EasybytezComFolder.py
	pyload/plugins/crypter/FiredriveComFolder.py
	pyload/plugins/crypter/HotfileFolderCom.py
	pyload/plugins/crypter/LinkSaveIn.py
	pyload/plugins/crypter/MultiuploadCom.py
	pyload/plugins/crypter/ShareRapidComFolder.py
	pyload/plugins/crypter/TusfilesNetFolder.py
	pyload/plugins/crypter/UploadableChFolder.py
	pyload/plugins/crypter/UploadedToFolder.py
	pyload/plugins/hook/Captcha9kw.py
	pyload/plugins/hook/MyfastfileCom.py
	pyload/plugins/hoster/BillionuploadsCom.py
	pyload/plugins/hoster/CramitIn.py
	pyload/plugins/hoster/EasybytezCom.py
	pyload/plugins/hoster/File4safeCom.py
	pyload/plugins/hoster/FileParadoxIn.py
	pyload/plugins/hoster/FilefactoryCom.py
	pyload/plugins/hoster/FileomCom.py
	pyload/plugins/hoster/FilerioCom.py
	pyload/plugins/hoster/FileshareInUa.py
	pyload/plugins/hoster/FiredriveCom.py
	pyload/plugins/hoster/Ftp.py
	pyload/plugins/hoster/HugefilesNet.py
	pyload/plugins/hoster/HundredEightyUploadCom.py
	pyload/plugins/hoster/Keep2shareCC.py
	pyload/plugins/hoster/LoadTo.py
	pyload/plugins/hoster/LomafileCom.py
	pyload/plugins/hoster/MegaNz.py
	pyload/plugins/hoster/MegacrypterCom.py
	pyload/plugins/hoster/MovReelCom.py
	pyload/plugins/hoster/MyvideoDe.py
	pyload/plugins/hoster/NosuploadCom.py
	pyload/plugins/hoster/NovafileCom.py
	pyload/plugins/hoster/PandaPlaNet.py
	pyload/plugins/hoster/PremiumTo.py
	pyload/plugins/hoster/RarefileNet.py
	pyload/plugins/hoster/RyushareCom.py
	pyload/plugins/hoster/SecureUploadEu.py
	pyload/plugins/hoster/SendmywayCom.py
	pyload/plugins/hoster/ShareRapidCom.py
	pyload/plugins/hoster/SockshareCom.py
	pyload/plugins/hoster/StreamcloudEu.py
	pyload/plugins/hoster/TurbobitNet.py
	pyload/plugins/hoster/TusfilesNet.py
	pyload/plugins/hoster/UptoboxCom.py
	pyload/plugins/hoster/VidPlayNet.py
	pyload/plugins/hoster/WebshareCz.py
	pyload/plugins/internal/DeadCrypter.py
	pyload/plugins/internal/DeadHoster.py
	pyload/plugins/internal/MultiHoster.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/plugins/internal/SimpleHoster.py
	pyload/plugins/internal/UpdateManager.py
	pyload/plugins/internal/XFSPAccount.py
	pyload/plugins/internal/XFSPHoster.py
	pyload/utils/__init__.py
	pyload/utils/packagetools.py
	pyload/webui/app/cnl.py

1 files changed, 43 insertions, 39 deletions

diff --git a/pyload/plugins/hoster/FilecloudIo.py b/pyload/plugins/hoster/FilecloudIo.py
index c397a1a1a..7dc9a3a16 100644
--- a/pyload/plugins/hoster/FilecloudIo.py
+++ b/pyload/plugins/hoster/FilecloudIo.py
@@ -8,40 +8,42 @@ from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class FilecloudIo(SimpleHoster):
-    __name__ = "FilecloudIo"
-    __type__ = "hoster"
-    __version__ = "0.02"
+    __name__    = "FilecloudIo"
+    __type__    = "hoster"
+    __version__ = "0.04"
 
     __pattern__ = r'http://(?:www\.)?(?:filecloud\.io|ifile\.it|mihd\.net)/(?P<ID>\w+).*'
 
     __description__ = """Filecloud.io hoster plugin"""
-    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
-                   ("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("stickell", "l.stickell@yahoo.it")]
 
 
-    FILE_SIZE_PATTERN = r'{var __ab1 = (?P<S>\d+);}'
-    FILE_NAME_PATTERN = r'id="aliasSpan">(?P<N>.*?)&nbsp;&nbsp;<'
-    OFFLINE_PATTERN = r'l10n.(FILES__DOESNT_EXIST|REMOVED)'
-    TEMP_OFFLINE_PATTERN = r'l10n.FILES__WARNING'
+    SIZE_PATTERN = r'{var __ab1 = (?P<S>\d+);}'
+    NAME_PATTERN = r'id="aliasSpan">(?P<N>.*?)&nbsp;&nbsp;<'
+    OFFLINE_PATTERN = r'l10n\.(FILES__DOESNT_EXIST|REMOVED)'
+    TEMP_OFFLINE_PATTERN = r'l10n\.FILES__WARNING'
 
-    UKEY_PATTERN = r"'ukey'\s*:'(\w+)',"
-    AB1_PATTERN = r"if\( __ab1 == '(\w+)' \)"
+    UKEY_PATTERN = r'\'ukey\'\s*:\'(\w+)'
+    AB1_PATTERN = r'if\( __ab1 == \'(\w+)\' \)'
     ERROR_MSG_PATTERN = r'var __error_msg\s*=\s*l10n\.(.*?);'
-    RECAPTCHA_PATTERN = r"var __recaptcha_public\s*=\s*'([^']+)';"
+    RECAPTCHA_PATTERN = r'var __recaptcha_public\s*=\s*\'(.+?)\';'
 
-    LINK_PATTERN = r'"(http://s\d+.filecloud.io/%s/\d+/.*?)"'
+    LINK_PATTERN = r'"(http://s\d+\.filecloud\.io/%s/\d+/.*?)"'
 
 
     def setup(self):
         self.resumeDownload = self.multiDL = True
         self.chunkLimit = 1
 
+
     def handleFree(self):
-        data = {"ukey": self.file_info['ID']}
+        data = {"ukey": self.info['ID']}
 
         m = re.search(self.AB1_PATTERN, self.html)
         if m is None:
-            self.parseError("__AB1")
+            self.error(_("__AB1"))
         data['__ab1'] = m.group(1)
 
         recaptcha = ReCaptcha(self)
@@ -50,10 +52,10 @@ class FilecloudIo(SimpleHoster):
         captcha_key = m.group(1) if m else recaptcha.detect_key()
 
         if captcha_key is None:
-            self.parseError("ReCaptcha key not found")
+            self.error(_("ReCaptcha key not found"))
 
         if not self.account:
-            self.fail("User not logged in")
+            self.fail(_("User not logged in"))
         elif not self.account.logged_in:
             captcha_challenge, captcha_response = recaptcha.challenge(captcha_key)
             self.account.form_data = {"recaptcha_challenge_field": captcha_challenge,
@@ -62,50 +64,52 @@ class FilecloudIo(SimpleHoster):
             self.retry(2)
 
         json_url = "http://filecloud.io/download-request.json"
-        response = self.load(json_url, post=data)
-        self.logDebug(response)
-        response = json_loads(response)
+        res = self.load(json_url, post=data)
+        self.logDebug(res)
+        res = json_loads(res)
 
-        if "error" in response and response['error']:
-            self.fail(response)
+        if "error" in res and res['error']:
+            self.fail(res)
 
-        self.logDebug(response)
-        if response['captcha']:
+        self.logDebug(res)
+        if res['captcha']:
             data['ctype'] = "recaptcha"
 
-            for _ in xrange(5):
+            for _i in xrange(5):
                 data['recaptcha_challenge'], data['recaptcha_response'] = recaptcha.challenge(captcha_key)
 
                 json_url = "http://filecloud.io/download-request.json"
-                response = self.load(json_url, post=data)
-                self.logDebug(response)
-                response = json_loads(response)
+                res = self.load(json_url, post=data)
+                self.logDebug(res)
+                res = json_loads(res)
 
-                if "retry" in response and response['retry']:
+                if "retry" in res and res['retry']:
                     self.invalidCaptcha()
                 else:
                     self.correctCaptcha()
                     break
             else:
-                self.fail("Incorrect captcha")
+                self.fail(_("Incorrect captcha"))
 
-        if response['dl']:
+        if res['dl']:
             self.html = self.load('http://filecloud.io/download.html')
-            m = re.search(self.LINK_PATTERN % self.file_info['ID'], self.html)
+
+            m = re.search(self.LINK_PATTERN % self.info['ID'], self.html)
             if m is None:
-                self.parseError("Download URL")
-            download_url = m.group(1)
-            self.logDebug("Download URL: %s" % download_url)
+                self.error(_("LINK_PATTERN not found"))
 
-            if "size" in self.file_info and self.file_info['size']:
-                self.check_data = {"size": int(self.file_info['size'])}
+            if "size" in self.info and self.info['size']:
+                self.check_data = {"size": int(self.info['size'])}
+
+            download_url = m.group(1)
             self.download(download_url)
         else:
-            self.fail("Unexpected server response")
+            self.fail(_("Unexpected server response"))
+
 
     def handlePremium(self):
         akey = self.account.getAccountData(self.user)['akey']
-        ukey = self.file_info['ID']
+        ukey = self.info['ID']
         self.logDebug("Akey: %s | Ukey: %s" % (akey, ukey))
         rep = self.load("http://api.filecloud.io/api-fetch_download_url.api",
                         post={"akey": akey, "ukey": ukey})