From f9c64493aeabe27111c92ca76d05f88cbbe85b75 Mon Sep 17 00:00:00 2001 From: GamaC0de Date: Mon, 11 Apr 2016 17:20:23 +0300 Subject: [NitroflareCom] fix #2421 --- module/plugins/accounts/NitroflareCom.py | 6 +++--- module/plugins/hoster/NitroflareCom.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'module') diff --git a/module/plugins/accounts/NitroflareCom.py b/module/plugins/accounts/NitroflareCom.py index 5fd0ed512..eb3cc4528 100644 --- a/module/plugins/accounts/NitroflareCom.py +++ b/module/plugins/accounts/NitroflareCom.py @@ -11,7 +11,7 @@ from module.plugins.captcha.ReCaptcha import ReCaptcha class NitroflareCom(Account): __name__ = "NitroflareCom" __type__ = "account" - __version__ = "0.13" + __version__ = "0.14" __status__ = "testing" __description__ = """Nitroflare.com account plugin""" @@ -21,7 +21,7 @@ class NitroflareCom(Account): VALID_UNTIL_PATTERN = r'>Time Left(.+?)Your Daily Limit([\d.,]+) (?:[\w^_]+ )?/ ([\d.,]+)' + TRAFFIC_LEFT_PATTERN = r'>Your Daily Limit(?P[\d.,]+) (?P[\w^_]+ )?/ (?P[\d.,]+) (?P[\w^_]+)' LOGIN_FAIL_PATTERN = r'
    \s*
  • ' TOKEN_PATTERN = r'name="token" value="(.+?)"' @@ -59,7 +59,7 @@ class NitroflareCom(Account): m = re.search(self.TRAFFIC_LEFT_PATTERN, html) if m is not None: try: - trafficleft = self.parse_traffic(str(max(0, float(m.group(2)) - float(m.group(1)))), "GB") + trafficleft = self.parse_traffic(m.group('S2'), m.group('U2')) - self.parse_traffic(m.group('S1'), m.group('U1') if m.group('U1') else "B") except Exception, e: self.log_error(e, trace=True) diff --git a/module/plugins/hoster/NitroflareCom.py b/module/plugins/hoster/NitroflareCom.py index 68bb3bf04..e08c0e603 100644 --- a/module/plugins/hoster/NitroflareCom.py +++ b/module/plugins/hoster/NitroflareCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster class NitroflareCom(SimpleHoster): __name__ = "NitroflareCom" __type__ = "hoster" - __version__ = "0.20" + __version__ = "0.21" __status__ = "testing" __pattern__ = r'https?://(?:www\.)?nitroflare\.com/view/(?P[\w^_]+)' @@ -23,7 +23,8 @@ class NitroflareCom(SimpleHoster): __license__ = "GPLv3" __authors__ = [("sahil" , "sahilshekhawat01@gmail.com"), ("Walter Purcaro", "vuolter@gmail.com" ), - ("Stickell" , "l.stickell@yahoo.it" )] + ("Stickell" , "l.stickell@yahoo.it" ), + ("GammaC0de", "nitzo2001[AT]yahoo[DOT]com")] INFO_PATTERN = r'title="(?P.+?)".+>(?P[\d.,]+) (?P[\w^_]+)' OFFLINE_PATTERN = r'>File doesn\'t exist' -- cgit v1.2.3