Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/captcha/OCR.py
	module/plugins/captcha/captcha.py
	module/plugins/crypter/DailymotionBatch.py
	module/plugins/crypter/DailymotionComFolder.py
	module/plugins/crypter/YoutubeBatch.py
	module/plugins/crypter/YoutubeComFolder.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/Extractor.py
	pyload/plugin/OCR.py
	pyload/plugin/account/DebridItaliaCom.py
	pyload/plugin/account/MegaRapidCz.py
	pyload/plugin/account/NoPremiumPl.py
	pyload/plugin/account/RapideoPl.py
	pyload/plugin/addon/AndroidPhoneNotify.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/DeleteFinished.py
	pyload/plugin/addon/DownloadScheduler.py
	pyload/plugin/addon/ExternalScripts.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/addon/IRCInterface.py
	pyload/plugin/addon/JustPremium.py
	pyload/plugin/addon/MergeFiles.py
	pyload/plugin/addon/MultiHome.py
	pyload/plugin/addon/RestartFailed.py
	pyload/plugin/addon/RestartSlow.py
	pyload/plugin/addon/SkipRev.py
	pyload/plugin/addon/UnSkipOnFail.py
	pyload/plugin/addon/UpdateManager.py
	pyload/plugin/addon/WindowsPhoneNotify.py
	pyload/plugin/crypter/DDLMusicOrg.py
	pyload/plugin/crypter/DailymotionBatch.py
	pyload/plugin/crypter/DevhostSt.py
	pyload/plugin/crypter/EmbeduploadCom.py
	pyload/plugin/crypter/MultiloadCz.py
	pyload/plugin/crypter/YoutubeBatch.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/Captcha9Kw.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/DeathByCaptcha.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/AlldebridCom.py
	pyload/plugin/hoster/CzshareCom.py
	pyload/plugin/hoster/EuroshareEu.py
	pyload/plugin/hoster/FastixRu.py
	pyload/plugin/hoster/FastshareCz.py
	pyload/plugin/hoster/GooIm.py
	pyload/plugin/hoster/MediafireCom.py
	pyload/plugin/hoster/MegaDebridEu.py
	pyload/plugin/hoster/NitroflareCom.py
	pyload/plugin/hoster/OverLoadMe.py
	pyload/plugin/hoster/PremiumTo.py
	pyload/plugin/hoster/PremiumizeMe.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RealdebridCom.py
	pyload/plugin/hoster/SimplyPremiumCom.py
	pyload/plugin/hoster/SimplydebridCom.py
	pyload/plugin/hoster/SmoozedCom.py
	pyload/plugin/hoster/SoundcloudCom.py
	pyload/plugin/hoster/UlozTo.py
	pyload/plugin/hoster/UploadableCh.py
	pyload/plugin/hoster/UploadedTo.py
	pyload/plugin/hoster/UploadheroCom.py
	pyload/plugin/hoster/VeehdCom.py
	pyload/plugin/hoster/VimeoCom.py
	pyload/plugin/hoster/ZeveraCom.py
	pyload/plugin/hoster/ZippyshareCom.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/MultiHoster.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSHoster.py
	pyload/plugin/ocr/GigasizeCom.py
	pyload/plugin/ocr/LinksaveIn.py
	pyload/plugin/ocr/NetloadIn.py
	pyload/plugin/ocr/ShareonlineBiz.py

1 files changed, 31 insertions, 96 deletions

diff --git a/pyload/plugin/hoster/MediafireCom.py b/pyload/plugin/hoster/MediafireCom.py
index 5adf004d0..3b39e2420 100644
--- a/pyload/plugin/hoster/MediafireCom.py
+++ b/pyload/plugin/hoster/MediafireCom.py
@@ -1,128 +1,63 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from pyload.plugin.internal.captcha import SolveMedia
-from pyload.plugin.internal.SimpleHoster import SimpleHoster, parseFileInfo
-from pyload.network.RequestFactory import getURL
-
-
-def replace_eval(js_expr):
-    return js_expr.replace(r'eval("', '').replace(r"\'", r"'").replace(r'\"', r'"')
-
-
-def checkHTMLHeader(url):
-    try:
-        for _i in xrange(3):
-            header = getURL(url, just_header=True)
-
-            for line in header.splitlines():
-                line = line.lower()
-
-                if 'location' in line:
-                    url = line.split(':', 1)[1].strip()
-                    if 'error.php?errno=320' in url:
-                        return url, 1
-
-                    if not url.startswith('http://'):
-                        url = 'http://www.mediafire.com' + url
-
-                    break
-
-                elif 'content-disposition' in line:
-                    return url, 2
-            else:
-                break
-    except Exception:
-        return url, 3
-    else:
-        return url, 0
-
-
-def getInfo(urls):
-    for url in urls:
-        location, status = checkHTMLHeader(url)
-
-        if status:
-            file_info = (url, 0, status, url)
-        else:
-            file_info = parseFileInfo(MediafireCom, url, getURL(url, decode=True))
-
-        yield file_info
+from module.plugins.internal.CaptchaService import SolveMedia
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class MediafireCom(SimpleHoster):
     __name__    = "MediafireCom"
     __type__    = "hoster"
-    __version__ = "0.84"
+    __version__ = "0.85"
 
-    __pattern__ = r'http://(?:www\.)?mediafire\.com/(file/|(view/?|download\.php)?\?)(\w{11}|\w{15})($|/)'
+    __pattern__ = r'https?://(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/))\w+'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Mediafire.com hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
-                       ("stickell", "l.stickell@yahoo.it")]
+                       ("stickell", "l.stickell@yahoo.it"),
+                       ("Walter Purcaro", "vuolter@gmail.com")]
+
 
+    NAME_PATTERN    = r'<META NAME="description" CONTENT="(?P<N>.+?)"/>'
+    SIZE_PATTERN    = r'<li>File size: <span>(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
+    INFO_PATTERN    = r'oFileSharePopup\.ald\(\'.*?\',\'(?P<N>.+?)\',\'(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)\',\'\',\'(?P<H>.+?)\'\)'
+    OFFLINE_PATTERN = r'class="error_msg_title"'
 
-    NAME_PATTERN    = r'<META NAME="description" CONTENT="(?P<N>[^"]+)"/>'
-    INFO_PATTERN    = r'oFileSharePopup\.ald\(\'(?P<ID>[^\']*)\',\'(?P<N>[^\']*)\',\'(?P<S>[^\']*)\',\'\',\'(?P<H>[^\']*)\'\)'
-    OFFLINE_PATTERN = r'class="error_msg_title"> Invalid or Deleted File. </div>'
+    LINK_FREE_PATTERN = r'kNO = "(.+?)"'
 
     PASSWORD_PATTERN = r'<form name="form_password"'
 
 
     def setup(self):
-        self.multiDL = False
-
-
-    def process(self, pyfile):
-        pyfile.url = re.sub(r'/view/?\?', '/?', pyfile.url)
+        self.resumeDownload = True
+        self.multiDL        = True
 
-        self.link, result = checkHTMLHeader(pyfile.url)
-        self.logDebug("Location (%d): %s" % (result, self.link))
 
-        if result == 0:
-            self.html = self.load(self.link, decode=True)
-            self.checkCaptcha()
-            self.multiDL = True
-            self.check_data = self.getFileInfo()
-
-            if self.account:
-                self.handlePremium(pyfile)
-            else:
-                self.handleFree(pyfile)
-        elif result == 1:
-            self.offline()
-        else:
-            self.multiDL = True
-            self.download(self.link, disposition=True)
+    def handleFree(self, pyfile):
+        solvemedia  = SolveMedia(self)
+        captcha_key = solvemedia.detect_key()
 
+        if captcha_key:
+            response, challenge = solvemedia.challenge(captcha_key)
+            self.html = self.load(pyfile.url,
+                                  post={'adcopy_challenge': challenge,
+                                        'adcopy_response' : response},
+                                  decode=True)
 
-    def handleFree(self, pyfile):
         if self.PASSWORD_PATTERN in self.html:
             password = self.getPassword()
 
-            if password:
-                self.logInfo(_("Password protected link, trying ") + password)
-                self.html = self.load(self.link, post={"downloadp": password})
+            if not password:
+                self.fail(_("No password found"))
+            else:
+                self.logInfo(_("Password protected link, trying: ") + password)
+                self.html = self.load(self.link, post={'downloadp': password})
 
                 if self.PASSWORD_PATTERN in self.html:
                     self.fail(_("Incorrect password"))
-            else:
-                self.fail(_("No password found"))
-
-        m = re.search(r'kNO = r"(http://.*?)";', self.html)
-        if m is None:
-            self.error(_("No download URL"))
 
-        download_url = m.group(1)
-        self.download(download_url)
+        return super(MediafireCom, self).handleFree(pyfile)
 
 
-    def checkCaptcha(self):
-        solvemedia = SolveMedia(self)
-        response, challenge = solvemedia.challenge()
-        self.html = self.load(self.link,
-                              post={'adcopy_challenge': challenge,
-                                    'adcopy_response' : response},
-                              decode=True)
+getInfo = create_getInfo(MediafireCom)