Move getFileInfo to SimpleHoster.py; update Mediafire

1 files changed, 17 insertions, 40 deletions

diff --git a/module/plugins/hoster/IfileIt.py b/module/plugins/hoster/IfileIt.py
index 2b70729a9..3bc60220a 100644
--- a/module/plugins/hoster/IfileIt.py
+++ b/module/plugins/hoster/IfileIt.py
@@ -17,62 +17,39 @@
 """
 
 import re
-
+from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo
 from module.common.json_layer import json_loads
-from module.common.JsEngine import JsEngine
 from module.plugins.ReCaptcha import ReCaptcha
-from module.plugins.Hoster import Hoster
 from module.network.RequestFactory import getURL
 
 def getInfo(urls):
     result = []
 
     for url in urls:
-        html = getURL(url, decode=True)
-        if re.search(IfileIt.FILE_OFFLINE_PATTERN, html):
-            # File offline
-            result.append((url, 0, 1, url))
-        else:
-            # Get file info
-            name, size = url, 0
-
-            found = re.search(IfileIt.FILE_INFO_PATTERN, html)
-            if found is not None:
-                name, size, units = found.groups()
-                size = float(size) * 1024 ** {'kB': 1, 'MB': 2, 'GB': 3}[units]
-                result.append((name, size, 2, url))
+        file_info = parseFileInfo(IfileIt, url, getURL(url, decode=True)) 
+        result.append(file_info)
+            
     yield result
 
-
-class IfileIt(Hoster):
+class IfileIt(SimpleHoster):
     __name__ = "IfileIt"
     __type__ = "hoster"
-    __pattern__ = r"http://(?:\w*\.)*ifile\.it/.*"
-    __version__ = "0.2"
+    __pattern__ = r"http://(?:\w*\.)*ifile\.it/(\w+).*"
+    __version__ = "0.22"
     __description__ = """Ifile.it"""
     __author_name__ = ("zoidberg")
 
-    EVAL_PATTERN = r'(eval\(function\(p,a,c,k,e,d\).*)'
-    DEC_PATTERN = r"function requestBtn_clickEvent[^}]*url:\s*([^,]+)"
+    #EVAL_PATTERN = r'(eval\(function\(p,a,c,k,e,d\).*)'
+    #DEC_PATTERN = r"requestBtn_clickEvent[^}]*url:\s*([^,]+)"
     DOWNLOAD_LINK_PATTERN = r'</span> If it doesn\'t, <a target="_blank" href="([^"]+)">'
     RECAPTCHA_KEY_PATTERN = r"var __recaptcha_public\s*=\s*'([^']+)';"
-    FILE_INFO_PATTERN = r'<span style="cursor: default;[^>]*>\s*(.*?)\s*&nbsp;\s*<strong>\s*([0-9.]+)\s*(kB|MB|GB)\s*</strong>\s*</span>'
+    FILE_INFO_PATTERN = r'<span style="cursor: default;[^>]*>\s*(.*?)\s*&nbsp;\s*<strong>\s*([0-9.]+)\s*([kKMG]i?B)\s*</strong>\s*</span>'
     FILE_OFFLINE_PATTERN = r'$\("#errorPnl"\)\.empty\(\)\.append\( "no such file" \);'
-
-    def process(self, pyfile):
-        self.html = self.load(pyfile.url)
-
-        found = re.search(self.FILE_INFO_PATTERN, self.html)
-        pyfile.name = found.group(1)
-        pyfile.size = pyfile.size = float(found.group(2)) * 1024 ** {'kB': 1, 'MB': 2, 'GB': 3}[found.group(3)]
-
-        eval_string = re.search(self.EVAL_PATTERN, self.html).group(1)
-        dec_string = re.search(self.DEC_PATTERN, self.html).group(1)
-
-        js = JsEngine()
-        json_url = js.eval(eval_string + ";" + dec_string)
-        self.logDebug(json_url)
-
+        
+    def handleFree(self):      
+        ukey = re.search(self.__pattern__, self.pyfile.url).group(1)
+        json_url = 'http://ifile.it/download-request2.json?ukey=' + ukey
+             
         json_response = json_loads(self.load(json_url))
         self.logDebug(json_response)
         if json_response["captcha"]:
@@ -98,8 +75,8 @@ class IfileIt(Hoster):
                 self.fail("Incorrect captcha")
 
         # load twice
-        self.html = self.load(pyfile.url)
-        self.html = self.load(pyfile.url)
+        self.html = self.load(self.pyfile.url)
+        self.html = self.load(self.pyfile.url)
         download_url = re.search(self.DOWNLOAD_LINK_PATTERN, self.html).group(1)
 
         self.download(download_url)
\ No newline at end of file