1 files changed, 37 insertions, 47 deletions

diff --git a/module/plugins/hoster/IfileIt.py b/module/plugins/hoster/IfileIt.py
index 6c754624b..2dae4cd80 100644
--- a/module/plugins/hoster/IfileIt.py
+++ b/module/plugins/hoster/IfileIt.py
@@ -1,77 +1,67 @@
 # -*- coding: utf-8 -*-
 
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License,
-    or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-    @author: zoidberg
-"""
-
 import re
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
 from module.common.json_layer import json_loads
 from module.plugins.internal.CaptchaService import ReCaptcha
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class IfileIt(SimpleHoster):
-    __name__ = "IfileIt"
-    __type__ = "hoster"
+    __name__    = "IfileIt"
+    __type__    = "hoster"
+    __version__ = "0.28"
+
     __pattern__ = r'^unmatchable$'
-    __version__ = "0.27"
+
     __description__ = """Ifile.it"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
-
-    #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*(?P<N>.*?)\s*&nbsp;\s*<strong>\s*(?P<S>[0-9.]+)\s*(?P<U>[kKMG])i?B\s*</strong>\s*</span>'
-    FILE_OFFLINE_PATTERN = r'<span style="cursor: default;[^>]*>\s*&nbsp;\s*<strong>\s*</strong>\s*</span>'
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+
+
+    LINK_PATTERN = r'</span> If it doesn\'t, <a target="_blank" href="([^"]+)">'
+    RECAPTCHA_PATTERN = r'var __recaptcha_public\s*=\s*\'(.+?)\''
+    INFO_PATTERN = r'<span style="cursor: default;[^>]*>\s*(?P<N>.*?)\s*&nbsp;\s*<strong>\s*(?P<S>[\d.,]+)\s*(?P<U>[\w^_]+)\s*</strong>\s*</span>'
+    OFFLINE_PATTERN = r'<span style="cursor: default;[^>]*>\s*&nbsp;\s*<strong>\s*</strong>\s*</span>'
     TEMP_OFFLINE_PATTERN = r'<span class="msg_red">Downloading of this file is temporarily disabled</span>'
 
+
     def handleFree(self):
-        ukey = re.match(self.__pattern__, self.pyfile.url).group(1)
-        json_url = 'http://ifile.it/new_download-request.json'
+        ukey      = re.match(self.__pattern__, self.pyfile.url).group(1)
+        json_url  = 'http://ifile.it/new_download-request.json'
         post_data = {"ukey": ukey, "ab": "0"}
+        res       = json_loads(self.load(json_url, post=post_data))
+
+        self.logDebug(res)
 
-        json_response = json_loads(self.load(json_url, post=post_data))
-        self.logDebug(json_response)
-        if json_response['status'] == 3:
+        if res['status'] == 3:
             self.offline()
 
-        if json_response["captcha"]:
-            captcha_key = re.search(self.RECAPTCHA_KEY_PATTERN, self.html).group(1)
+        if res['captcha']:
+            captcha_key = re.search(self.RECAPTCHA_PATTERN, self.html).group(1)
+
             recaptcha = ReCaptcha(self)
-            post_data["ctype"] = "recaptcha"
+            post_data['ctype'] = "recaptcha"
 
-            for _ in xrange(5):
-                post_data["recaptcha_challenge"], post_data["recaptcha_response"] = recaptcha.challenge(captcha_key)
-                json_response = json_loads(self.load(json_url, post=post_data))
-                self.logDebug(json_response)
+            for _i in xrange(5):
+                challenge, response = recaptcha.challenge(captcha_key)
+                post_data.update({'recaptcha_challenge': challenge,
+                                  'recaptcha_response' : response})
+                res = json_loads(self.load(json_url, post=post_data))
+                self.logDebug(res)
 
-                if json_response["retry"]:
+                if res['retry']:
                     self.invalidCaptcha()
                 else:
                     self.correctCaptcha()
                     break
             else:
-                self.fail("Incorrect captcha")
+                self.fail(_("Incorrect captcha"))
 
-        if not "ticket_url" in json_response:
-            self.parseError("Download URL")
+        if not "ticket_url" in res:
+            self.error(_("No download URL"))
 
-        self.download(json_response["ticket_url"])
+        self.download(res['ticket_url'])
 
 
 getInfo = create_getInfo(IfileIt)