Update DepositfilesCom, MediafireCom, UlozTo, XFileSharingPro

4 files changed, 31 insertions, 9 deletions

diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index be5e65d52..b3ba1ea73 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -11,12 +11,13 @@ class DepositfilesCom(SimpleHoster):
     __name__ = "DepositfilesCom"
     __type__ = "hoster"
     __pattern__ = r"http://[\w\.]*?depositfiles\.com(/\w{1,3})?/files/[\w]+"
-    __version__ = "0.39"
+    __version__ = "0.40"
     __description__ = """Depositfiles.com Download Hoster"""
     __author_name__ = ("spoob", "zoidberg")
     __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz")
 
-    FILE_INFO_PATTERN = r'File name: <b title="(?P<N>[^"]+)">.*\s*<span class="nowrap">File size: <b>(?P<S>[0-9.]+)&nbsp;(?P<U>[kKMG])i?B</b>'
+    FILE_NAME_PATTERN = r'File name: <b title="(?P<N>[^"]+)'
+    FILE_SIZE_PATTERN = r'File size: <b>(?P<S>[0-9.]+)&nbsp;(?P<U>[kKMG])i?B</b>'
     FILE_OFFLINE_PATTERN = r'<span class="html_download_api-not_exists"></span>'
     FILE_URL_REPLACEMENTS = [(r"\.com(/.*?)?/files", ".com/en/files"), (r"\.html$", "")]
 
diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py
index c1d6e3595..717143880 100644
--- a/module/plugins/hoster/MediafireCom.py
+++ b/module/plugins/hoster/MediafireCom.py
@@ -58,7 +58,7 @@ class MediafireCom(SimpleHoster):
     __name__ = "MediafireCom"
     __type__ = "hoster"
     __pattern__ = r"http://(\w*\.)*mediafire\.com/(file/|(download.php)?\?)(\w{11}|\w{15})($|/)"
-    __version__ = "0.74"
+    __version__ = "0.75"
     __description__ = """Mediafire.com plugin - free only"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
@@ -104,6 +104,7 @@ class MediafireCom(SimpleHoster):
             else:
                 self.fail("No or incorrect password")
         
+        """
         links = re.findall(self.DOWNLOAD_LINK_PATTERN, self.html)
         link_count = len(links)
         self.logDebug('LINKS ', links)
@@ -131,6 +132,11 @@ class MediafireCom(SimpleHoster):
             
         else:
             zindex, download_url = links[0]
+        """
+        found = re.search(r'kNO = "(http://.*?)";', self.html)
+        if not found: self.parseError("Download URL")
+        download_url = found.group(1)
+        self.logDebug("DOWNLOAD LINK:", download_url) 
             
         self.download(download_url)
 
diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py
index de60cb7c7..dc9f9a733 100644
--- a/module/plugins/hoster/UlozTo.py
+++ b/module/plugins/hoster/UlozTo.py
@@ -27,7 +27,7 @@ class UlozTo(SimpleHoster):
     __name__ = "UlozTo"
     __type__ = "hoster"
     __pattern__ = r"http://(\w*\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/(?:live/)?(?P<id>\w+/[^/?]*)"
-    __version__ = "0.86"
+    __version__ = "0.87"
     __description__ = """uloz.to"""
     __author_name__ = ("zoidberg")
 
@@ -102,8 +102,9 @@ class UlozTo(SimpleHoster):
         self.download("http://www.ulozto.net" + action, post=inputs, cookies=True)
 
     def handlePremium(self):
-        parsed_url = self.findDownloadURL(premium=True)
-        self.download(parsed_url, post={"download": "Download"})
+        self.download(self.pyfile.url + "?do=directDownload")
+        #parsed_url = self.findDownloadURL(premium=True)
+        #self.download(parsed_url, post={"download": "Download"})
 
     def findDownloadURL(self, premium=False):
         msg = "%s link" % ("Premium" if premium else "Free")
diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
index 0d44300af..7cc63f4ae 100644
--- a/module/plugins/hoster/XFileSharingPro.py
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -34,7 +34,7 @@ class XFileSharingPro(SimpleHoster):
     __name__ = "XFileSharingPro"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)*((aieshare|amonshare|asixfiles|azsharing|banashare|batubia|bebasupload|boosterking|buckshare|bulletupload|crocshare|ddlanime|divxme|dopeshare|downupload|eyesfile|eyvx|fik1|file(4safe|4sharing|band|beep|bit|box|dove|fat|forth|made|mak|planet|playgroud|race|rio|strack|upper|velocity)|fooget|4bytez|freefilessharing|glumbouploads|grupload|heftyfile|hipfile|host4desi|hulkshare.com|idupin|imageporter|isharefast|jalurcepat|kingsupload|laoupload|linkzhost|loombo|maknyos|migahost|mlfat4arab|movreel|netuploaded|ok2upload|180upload|1hostclick|ovfile|putshare|pyramidfiles|q4share|queenshare|ravishare|rockdizfile|sendmyway|share(76|beast|hut|run|swift)|sharingonline|6ybh-upload|skipfile|spaadyshare|space4file|speedoshare|upload(baz|boost|c|dot|floor|ic|dville)|uptobox|vidbull|zalaa|zomgupload)\.com|(kupload|movbay|multishare|omegave|toucansharing|uflinq)\.org|(annonhost|fupload|muchshare|supashare|tusfiles|usershare|xuploading)\.net|(banicrazy|flowhot|upbrasil)\.info|(shareyourfilez)|.biz|(bzlink|)\.us|(cloudcache|fileserver)\.cc|(farshare|kingshare)\.to|(filemaze|filehost)\.ws|(goldfile|xfileshare)\.eu|(filestock|moidisk)\.ru|4up\.me|kfiles\.kz|odsiebie\.pl|upchi\.co\.il|upit\.in|verzend\.be)/\w{12}" 
-    __version__ = "0.02"
+    __version__ = "0.04"
     __description__ = """XFileSharingPro common hoster base"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
@@ -47,9 +47,10 @@ class XFileSharingPro(SimpleHoster):
     WAIT_PATTERN = r'<span id="countdown_str">.*?>(\d+)</span>'
     OVR_DOWNLOAD_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
     OVR_KILL_LINK_PATTERN = r'<h2>Delete Link</h2>\s*<textarea[^>]*>([^<]+)'
-    CAPTCHA_URL_PATTERN = r'(http://[^"\']+?/captchas/[^"\']+)'
+    CAPTCHA_URL_PATTERN = r'(http://[^"\']+?/captchas?/[^"\']+)'
     RECAPTCHA_URL_PATTERN = r'http://[^"\']+?recaptcha[^"\']+?\?k=([^"\']+)"'
-    ERROR_PATTERN = r'class="err">(.*?)<'
+    CAPTCHA_DIV_PATTERN = r'<b>Enter code.*?<div.*?>(.*?)</div>'
+    ERROR_PATTERN = r'class=["\']err["\'][^>]*>(.*?)</'
 
     DIRECT_LINK_PATTERN = r'This direct link.*?href=["\'](.*?)["\']'
     
@@ -154,6 +155,10 @@ class XFileSharingPro(SimpleHoster):
                 self.invalidCaptcha()
             elif 'countdown' in self.errmsg:
                 self.retry(3)
+            elif 'maintenance' in self.errmsg:
+                self.tempOffline()
+            elif 'download files up to' in self.errmsg:
+                self.fail("File too large for free download")
             
         else:
             self.errmsg = None
@@ -222,6 +227,15 @@ class XFileSharingPro(SimpleHoster):
                 captcha_url = found.group(1)
                 inputs['code'] = self.decryptCaptcha(captcha_url)
                 return 2
+            else:
+                found = re.search(self.CAPTCHA_DIV_PATTERN, self.html, re.S)  
+                if found:
+                    captcha_div = found.group(1)
+                    self.logDebug(captcha_div)  
+                    numerals = re.findall('<span.*?padding-left\s*:\s*(\d+).*?>(\d)</span>', html_unescape(captcha_div))
+                    inputs['code'] = "".join([a[1] for a in sorted(numerals, key = lambda num: int(num[0]))])
+                    self.logDebug("CAPTCHA", inputs['code'], numerals) 
+                    return 3                
         return 0
         
 getInfo = create_getInfo(XFileSharingPro)
\ No newline at end of file