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, 74 insertions, 199 deletions

diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index eb52f9721..83a16c251 100644
--- a/module/plugins/hoster/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
@@ -1,245 +1,120 @@
 # -*- coding: utf-8 -*-
-#
-# Test links:
-# http://ul.to/044yug9o
-# http://ul.to/gzfhd0xs
 
 import re
 
 from time import sleep
 
-from pyload.network.RequestFactory import getURL
-from pyload.plugin.Hoster import Hoster
-from pyload.plugin.Plugin import chunks
-from pyload.plugin.internal.captcha import ReCaptcha
-from pyload.utils import html_unescape, parseFileSize
+from module.network.RequestFactory import getURL
+from module.plugins.internal.CaptchaService import ReCaptcha
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
-key = "bGhGMkllZXByd2VEZnU5Y2NXbHhYVlZ5cEE1bkEzRUw=".decode('base64')
-
-
-def getID(url):
-    """ returns id from file url"""
-    m = re.match(UploadedTo.__pattern__, url)
-    return m.group('ID')
-
-
-def getAPIData(urls):
-    post = {"apikey": key}
-
-    idMap = {}
-
-    for i, url in enumerate(urls):
-        id = getID(url)
-        post['id_%s' % i] = id
-        idMap[id] = url
-
-    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
-        else:
-            sleep(3)
-
-    result = {}
-
-    if api:
-        for line in api.splitlines():
-            data = line.split(",", 4)
-            if data[1] in idMap:
-                result[data[1]] = (data[0], data[2], data[4], data[3], idMap[data[1]])
-
-    return result
-
-
-def parseFileInfo(self, url='', html=''):
-    if not html and hasattr(self, "html"):
-        html = self.html
-
-    name = url
-    size = 0
-    fileid = None
-
-    if re.search(self.OFFLINE_PATTERN, html):
-        # File offline
-        status = 1
-    else:
-        m = re.search(self.INFO_PATTERN, html)
-        if m:
-            name, fileid = html_unescape(m.group('N')), m.group('ID')
-            size = parseFileSize(m.group('S'))
-            status = 2
-        else:
-            status = 3
-
-    return name, size, status, fileid
-
+class UploadedTo(SimpleHoster):
+    __name__    = "UploadedTo"
+    __type__    = "hoster"
+    __version__ = "0.84"
 
-def getInfo(urls):
-    for chunk in chunks(urls, 80):
-        result = []
+    __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)'
 
-        api = getAPIData(chunk)
+    __description__ = """Uploaded.net hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
-        for data in api.itervalues():
-            if data[0] == "online":
-                result.append((html_unescape(data[2]), data[1], 2, data[4]))
 
-            elif data[0] == "offline":
-                result.append((data[4], 0, 1, data[4]))
+    API_KEY = "lhF2IeeprweDfu9ccWlxXVVypA5nA3EL"
 
-        yield result
+    URL_REPLACEMENTS = [(__pattern__ + ".*", r'http://uploaded.net/file/\g<ID>')]
 
+    LINK_PREMIUM_PATTERN = r'<div class="tfree".*\s*<form method="post" action="(.+?)"'
 
-class UploadedTo(Hoster):
-    __name__    = "UploadedTo"
-    __type__    = "hoster"
-    __version__ = "0.75"
+    WAIT_PATTERN   = r'Current waiting period: <span>(\d+)'
+    DL_LIMIT_ERROR = r'You have reached the max. number of possible free downloads for this hour'
 
-    __pattern__ = r'https?://(?:www\.)?(uploaded\.(to|net)|ul\.to)(/file/|/?\?id=|.*?&id=|/)(?P<ID>\w+)'
 
-    __description__ = """Uploaded.net hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("spoob", "spoob@pyload.org"),
-                       ("mkaay", "mkaay@mkaay.de"),
-                       ("zoidberg", "zoidberg@mujmail.cz"),
-                       ("netpok", "netpok@gmail.com"),
-                       ("stickell", "l.stickell@yahoo.it")]
+    @classmethod
+    def apiInfo(cls, url="", get={}, post={}):
+        info = super(UploadedTo, cls).apiInfo(url)
 
+        for _i in xrange(5):
+            html = getURL("http://uploaded.net/api/filemultiple",
+                          get={"apikey": cls.API_KEY, 'id_0': re.match(cls.__pattern__, url).group('ID')},
+                          decode=True)
+
+            if html != "can't find request":
+                api = html.split(",", 4)
+                if api[0] == "online":
+                    info.update({'name': api[4].strip(), 'size': api[2], 'status': 2})
+                else:
+                    info['status'] = 1
+                break
+            else:
+                sleep(3)
 
-    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'
+        return info
 
 
     def setup(self):
         self.multiDL    = self.resumeDownload = self.premium
         self.chunkLimit = 1  # critical problems with more chunks
 
-        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)
+    def checkErrors(self):
+        if 'var free_enabled = false;' in self.html:
+            self.logError(_("Free-download capacities exhausted"))
+            self.retry(24, 5 * 60)
 
-        api = getAPIData([pyfile.url])
+        elif "limit-size" in self.html:
+            self.fail(_("File too big for free download"))
 
-        # TODO: fallback to parse from site, because api sometimes delivers wrong status codes
+        elif "limit-slot" in self.html:  # Temporary restriction so just wait a bit
+            self.wait(30 * 60, True)
+            self.retry()
 
-        if not api:
-            self.logWarning(_("No response for API call"))
+        elif "limit-parallel" in self.html:
+            self.fail(_("Cannot download in parallel"))
 
-            self.html = unicode(self.load(pyfile.url, decode=False), 'iso-8859-1')
-            name, size, status, self.fileID = parseFileInfo(self)
-            self.logDebug(name, size, status, self.fileID)
-            if status == 1:
-                self.offline()
-            elif status == 2:
-                pyfile.name, pyfile.size = name, size
-            else:
-                self.error(_("file info"))
+        elif "limit-dl" in self.html or self.DL_LIMIT_ERROR in self.html:  # limit-dl
+            self.wait(3 * 60 * 60, True)
+            self.retry()
 
-        elif api == 'Access denied':
-            self.fail(_("API key invalid"))
+        elif '"err":"captcha"' in self.html:
+            self.invalidCaptcha()
 
         else:
-            if self.fileID not in api:
-                self.offline()
+            m = re.search(self.WAIT_PATTERN, self.html)
+            if m:
+                self.wait(m.group(1))
 
-            self.data = api[self.fileID]
-            if self.data[0] != "online":
-                self.offline()
 
-            pyfile.name = html_unescape(self.data[2])
-
-        # pyfile.name = self.get_file_name()
+    def handleFree(self, pyfile):
+        self.load("http://uploaded.net/language/en", just_header=True)
 
-        if self.premium:
-            self.handlePremium()
-        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(_("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:
-            #Direct download
-            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"))
-            url = m.group(1)
-            self.download(url, post={})
+        self.html = self.load("http://uploaded.net/js/download.js", decode=True)
 
+        recaptcha = ReCaptcha(self)
+        response, challenge = recaptcha.challenge()
 
-    def handleFree(self):
-        self.html = self.load(self.pyfile.url, decode=True)
+        self.html = self.load("http://uploaded.net/io/ticket/captcha/%s" % self.info['pattern']['ID'],
+                              post={'recaptcha_challenge_field': challenge,
+                                    'recaptcha_response_field' : response})
 
-        if 'var free_enabled = false;' in self.html:
-            self.logError(_("Free-download capacities exhausted"))
-            self.retry(24, 5 * 60)
+        if "type:'download'" in self.html:
+            self.correctCaptcha()
+            try:
+                self.link = re.search("url:'([^']+)", self.html).group(1)
 
-        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.setWait(int(m.group(1)))
+            except Exception:
+                pass
 
-        self.html = self.load("http://uploaded.net/js/download.js", decode=True)
+        self.checkErrors()
 
-        url = "http://uploaded.net/io/ticket/captcha/%s" % self.fileID
-        downloadURL = ""
 
-        recaptcha = ReCaptcha(self)
+    def checkFile(self):
+        if self.checkDownload({'limit-dl': self.DL_LIMIT_ERROR}):
+            self.wait(3 * 60 * 60, True)
+            self.retry()
 
-        for _i in xrange(5):
-            challenge, response = recaptcha.challenge()
-            options = {"recaptcha_challenge_field": challenge, "recaptcha_response_field": response}
-            self.wait()
-
-            result = self.load(url, post=options)
-            self.logDebug("Result: %s" % result)
-
-            if "limit-size" in result:
-                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 "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.invalidCaptcha()
-            elif "type:'download'" in result:
-                self.correctCaptcha()
-                downloadURL = re.search("url:'([^']+)", result).group(1)
-                break
-            else:
-                self.error(_("Unknown error: %s") % result)
+        return super(UploadedTo, self).checkFile()
 
-        if not downloadURL:
-            self.fail(_("No Download url retrieved/all captcha attempts failed"))
 
-        self.download(downloadURL, disposition=True)
-        check = self.checkDownload({"limit-dl": self.DL_LIMIT_PATTERN})
-        if check == "limit-dl":
-            self.setWait(3 * 60 * 60, True)
-            self.wait()
-            self.retry()
+getInfo = create_getInfo(UploadedTo)