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, 35 insertions, 33 deletions

diff --git a/pyload/plugins/hoster/UploadedTo.py b/pyload/plugins/hoster/UploadedTo.py
index f02b9951d..17e3a4a0f 100644
--- a/pyload/plugins/hoster/UploadedTo.py
+++ b/pyload/plugins/hoster/UploadedTo.py
@@ -34,7 +34,7 @@ def getAPIData(urls):
         post['id_%s' % i] = id
         idMap[id] = url
 
-    for _ in xrange(5):
+    for _i in xrange(5):
         api = unicode(getURL("http://uploaded.net/api/filemultiple", post=post, decode=False), 'iso-8859-1')
         if api != "can't find request":
             break
@@ -64,7 +64,7 @@ def parseFileInfo(self, url='', html=''):
         # File offline
         status = 1
     else:
-        m = re.search(self.FILE_INFO_PATTERN, html)
+        m = re.search(self.INFO_PATTERN, html)
         if m:
             name, fileid = html_unescape(m.group('N')), m.group('ID')
             size = parseFileSize(m.group('S'))
@@ -92,21 +92,22 @@ def getInfo(urls):
 
 
 class UploadedTo(Hoster):
-    __name__ = "UploadedTo"
-    __type__ = "hoster"
-    __version__ = "0.73"
+    __name__    = "UploadedTo"
+    __type__    = "hoster"
+    __version__ = "0.75"
 
     __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)'
 
     __description__ = """Uploaded.net hoster plugin"""
-    __authors__ = [("spoob", "spoob@pyload.org"),
-                   ("mkaay", "mkaay@mkaay.de"),
-                   ("zoidberg", "zoidberg@mujmail.cz"),
-                   ("netpok", "netpok@gmail.com"),
-                   ("stickell", "l.stickell@yahoo.it")]
+    __license__     = "GPLv3"
+    __authors__     = [("spoob", "spoob@pyload.org"),
+                       ("mkaay", "mkaay@mkaay.de"),
+                       ("zoidberg", "zoidberg@mujmail.cz"),
+                       ("netpok", "netpok@gmail.com"),
+                       ("stickell", "l.stickell@yahoo.it")]
 
 
-    FILE_INFO_PATTERN = r'<a href="file/(?P<ID>\w+)" id="filename">(?P<N>[^<]+)</a> &nbsp;\s*<small[^>]*>(?P<S>[^<]+)</small>'
+    INFO_PATTERN = r'<a href="file/(?P<ID>\w+)" id="filename">(?P<N>[^<]+)</a> &nbsp;\s*<small[^>]*>(?P<S>[^<]+)</small>'
     OFFLINE_PATTERN = r'<small class="cL">Error: 404</small>'
     DL_LIMIT_PATTERN = r'You have reached the max. number of possible free downloads for this hour'
 
@@ -118,6 +119,7 @@ class UploadedTo(Hoster):
         self.fileID = getID(self.pyfile.url)
         self.pyfile.url = "http://uploaded.net/file/%s" % self.fileID
 
+
     def process(self, pyfile):
         self.load("http://uploaded.net/language/en", just_header=True)
 
@@ -126,7 +128,7 @@ class UploadedTo(Hoster):
         # TODO: fallback to parse from site, because api sometimes delivers wrong status codes
 
         if not api:
-            self.logWarning("No response for API call")
+            self.logWarning(_("No response for API call"))
 
             self.html = unicode(self.load(pyfile.url, decode=False), 'iso-8859-1')
             name, size, status, self.fileID = parseFileInfo(self)
@@ -136,7 +138,8 @@ class UploadedTo(Hoster):
             elif status == 2:
                 pyfile.name, pyfile.size = name, size
             else:
-                self.fail('Parse error - file info')
+                self.error(_("file info"))
+
         elif api == 'Access denied':
             self.fail(_("API key invalid"))
 
@@ -157,53 +160,53 @@ class UploadedTo(Hoster):
         else:
             self.handleFree()
 
+
     def handlePremium(self):
         info = self.account.getAccountInfo(self.user, True)
         self.logDebug("%(name)s: Use Premium Account (%(left)sGB left)" % {"name": self.__name__,
                                                                            "left": info['trafficleft'] / 1024 / 1024})
         if int(self.data[1]) / 1024 > info['trafficleft']:
-            self.logInfo(_("%s: Not enough traffic left" % self.__name__))
+            self.logInfo(_("Not enough traffic left"))
             self.account.empty(self.user)
             self.resetAccount()
             self.fail(_("Traffic exceeded"))
 
         header = self.load("http://uploaded.net/file/%s" % self.fileID, just_header=True)
-        if "location" in header:
+        if 'location' in header:
             #Direct download
-            print "Direct Download: " + header['location']
+            self.logDebug("Direct download link detected")
             self.download(header['location'])
         else:
             #Indirect download
             self.html = self.load("http://uploaded.net/file/%s" % self.fileID)
             m = re.search(r'<div class="tfree".*\s*<form method="post" action="(.*?)"', self.html)
             if m is None:
-                self.fail("Download URL not m. Try to enable direct downloads.")
+                self.fail(_("Download URL not m. Try to enable direct downloads"))
             url = m.group(1)
-            print "Premium URL: " + url
             self.download(url, post={})
 
+
     def handleFree(self):
         self.html = self.load(self.pyfile.url, decode=True)
 
         if 'var free_enabled = false;' in self.html:
-            self.logError("Free-download capacities exhausted.")
-            self.retry(max_tries=24, wait_time=5 * 60)
+            self.logError(_("Free-download capacities exhausted"))
+            self.retry(24, 5 * 60)
 
         m = re.search(r"Current waiting period: <span>(\d+)</span> seconds", self.html)
         if m is None:
-            self.fail("File not downloadable for free users")
+            self.fail(_("File not downloadable for free users"))
         self.setWait(int(m.group(1)))
 
-        js = self.load("http://uploaded.net/js/download.js", decode=True)
-
-        challengeId = re.search(r'Recaptcha\.create\("([^"]+)', js)
+        self.html = self.load("http://uploaded.net/js/download.js", decode=True)
 
         url = "http://uploaded.net/io/ticket/captcha/%s" % self.fileID
         downloadURL = ""
 
-        for _ in xrange(5):
-            re_captcha = ReCaptcha(self)
-            challenge, result = re_captcha.challenge(challengeId.group(1))
+        recaptcha = ReCaptcha(self)
+
+        for _i in xrange(5):
+            challenge, result = recaptcha.challenge()
             options = {"recaptcha_challenge_field": challenge, "recaptcha_response_field": result}
             self.wait()
 
@@ -211,29 +214,28 @@ class UploadedTo(Hoster):
             self.logDebug("Result: %s" % result)
 
             if "limit-size" in result:
-                self.fail("File too big for free download")
+                self.fail(_("File too big for free download"))
             elif "limit-slot" in result:  # Temporary restriction so just wait a bit
                 self.setWait(30 * 60, True)
                 self.wait()
                 self.retry()
             elif "limit-parallel" in result:
-                self.fail("Cannot download in parallel")
-            elif self.DL_LIMIT_PATTERN in result:  # limit-dl
+                self.fail(_("Cannot download in parallel"))
+            elif "limit-dl" in result or self.DL_LIMIT_PATTERN in result:  # limit-dl
                 self.setWait(3 * 60 * 60, True)
                 self.wait()
                 self.retry()
             elif '"err":"captcha"' in result:
-                self.logError("captcha is disabled")
                 self.invalidCaptcha()
             elif "type:'download'" in result:
                 self.correctCaptcha()
                 downloadURL = re.search("url:'([^']+)", result).group(1)
                 break
             else:
-                self.fail("Unknown error '%s'" % result)
+                self.error(_("Unknown error: %s") % result)
 
         if not downloadURL:
-            self.fail("No Download url retrieved/all captcha attempts failed")
+            self.fail(_("No Download url retrieved/all captcha attempts failed"))
 
         self.download(downloadURL, disposition=True)
         check = self.checkDownload({"limit-dl": self.DL_LIMIT_PATTERN})