summaryrefslogtreecommitdiffstats
path: root/module/plugins/accounts/NitroflareCom.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/accounts/NitroflareCom.py')
-rw-r--r--module/plugins/accounts/NitroflareCom.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/module/plugins/accounts/NitroflareCom.py b/module/plugins/accounts/NitroflareCom.py
index b7edcca32..af71b1321 100644
--- a/module/plugins/accounts/NitroflareCom.py
+++ b/module/plugins/accounts/NitroflareCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
class NitroflareCom(Account):
__name__ = "NitroflareCom"
__type__ = "account"
- __version__ = "0.06"
+ __version__ = "0.09"
__status__ = "testing"
__description__ = """Nitroflare.com account plugin"""
@@ -24,7 +24,7 @@ class NitroflareCom(Account):
TOKEN_PATTERN = r'name="token" value="(.+?)"'
- def parse_info(self, user, password, data, req):
+ def grab_info(self, user, password, data):
validuntil = -1
trafficleft = None
premium = False
@@ -33,13 +33,14 @@ class NitroflareCom(Account):
get={'s': "premium"})
m = re.search(self.VALID_UNTIL_PATTERN, html)
- if m:
+ if m is not None:
expiredate = m.group(1).strip()
self.log_debug("Time Left: " + expiredate)
try:
validuntil = sum(int(v) * {'day': 24 * 3600, 'hour': 3600, 'minute': 60}[u.lower()] for v, u in
re.findall(r'(\d+)\s*(day|hour|minute)', expiredate, re.I))
+
except Exception, e:
self.log_error(e)
@@ -53,9 +54,9 @@ class NitroflareCom(Account):
validuntil = -1
m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
- if m:
+ if m is not None:
try:
- trafficleft = self.parse_traffic(str(max(0, 50 - float(m.group(1)))) + " GB")
+ trafficleft = self.parse_traffic(str(max(0, 50 - float(m.group(1)))), "GB")
except Exception, e:
self.log_error(e)
@@ -67,7 +68,7 @@ class NitroflareCom(Account):
'premium' : premium}
- def login(self, user, password, data, req):
+ def signin(self, user, password, data):
html = self.load("https://nitroflare.com/login")
token = re.search(self.TOKEN_PATTERN, html).group(1)
@@ -79,4 +80,4 @@ class NitroflareCom(Account):
'token' : token})
if re.search(self.LOGIN_FAIL_PATTERN, html):
- self.login_fail()
+ self.fail_login()