diff options
| author |  GamaC0de <nitzo2001@yahoo.com>
| 2016-04-11 16:20:23 +0200 |
|---|---|---|
| committer | GamaC0de <nitzo2001@yahoo.com>
| 2016-04-11 16:20:23 +0200 |
| commit | f9c64493aeabe27111c92ca76d05f88cbbe85b75 (patch) | |
| tree | 62159d6e2926014478242d434c0044652b967d42 /module | |
| parent | [RapidgatorNet] Version up (diff) | |
| download | pyload-f9c64493aeabe27111c92ca76d05f88cbbe85b75.tar.xz | |
[NitroflareCom] fix #2421
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/accounts/NitroflareCom.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/NitroflareCom.py | 5 |
2 files changed, 6 insertions, 5 deletions
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</label><strong>(.+?)</' - TRAFFIC_LEFT_PATTERN = r'>Your Daily Limit</label><strong>([\d.,]+) (?:[\w^_]+ )?/ ([\d.,]+)' + TRAFFIC_LEFT_PATTERN = r'>Your Daily Limit</label><strong>(?P<S1>[\d.,]+) (?P<U1>[\w^_]+ )?/ (?P<S2>[\d.,]+) (?P<U2>[\w^_]+)' LOGIN_FAIL_PATTERN = r'<ul class="errors">\s*<li>' 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<ID>[\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<N>.+?)".+>(?P<S>[\d.,]+) (?P<U>[\w^_]+)' OFFLINE_PATTERN = r'>File doesn\'t exist' |