summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--module/plugins/accounts/RehostTo.py48
1 files changed, 30 insertions, 18 deletions
diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py
index 25b66b88d..4efe38cad 100644
--- a/module/plugins/accounts/RehostTo.py
+++ b/module/plugins/accounts/RehostTo.py
@@ -6,7 +6,7 @@ from module.plugins.Account import Account
class RehostTo(Account):
__name__ = "RehostTo"
__type__ = "account"
- __version__ = "0.14"
+ __version__ = "0.15"
__description__ = """Rehost.to account plugin"""
__license__ = "GPLv3"
@@ -14,23 +14,34 @@ class RehostTo(Account):
def loadAccountInfo(self, user, req):
- data = self.getAccountData(user)
+ premium = False
+ trafficleft = None
+ validuntil = -1
+ session = ""
+
html = req.load("http://rehost.to/api.php",
- get={'cmd': "login", 'user': user, 'pass': data['password']})
-
- session = [x.split("=") for x in html.split(",")][1][1]
-
- html = req.load("http://rehost.to/api.php",
- get={'cmd': "get_premium_credits", 'long_ses': session})
-
- traffic, valid = html.split(",")
-
- trafficleft = self.parseTraffic(traffic + "MB")
- validuntil = float(valid)
-
- return {'trafficleft': trafficleft,
- 'validuntil' : validuntil,
- 'session' : session}
+ get={'cmd' : "login", 'user': user,
+ 'pass': self.getAccountData(user)['password']})
+ try:
+ session = html.split(",")[1].split("=")[1]
+
+ html = req.load("http://rehost.to/api.php",
+ get={'cmd': "get_premium_credits", 'long_ses': session})
+
+ if html.strip() == "0,0" or "ERROR" not in html:
+ self.logDebug(html)
+ else:
+ traffic, valid = html.split(",")
+
+ premium = True
+ trafficleft = self.parseTraffic(traffic + "MB")
+ validuntil = float(valid)
+
+ finally:
+ return {'premium' : premium,
+ 'trafficleft': trafficleft,
+ 'validuntil' : validuntil,
+ 'session' : session}
def login(self, user, data, req):
@@ -38,5 +49,6 @@ class RehostTo(Account):
get={'cmd': "login", 'user': user, 'pass': data['password']},
decode=True)
- if "Login failed." in html:
+ if "ERROR" in html:
+ self.logDebug(html)
self.wrongPassword()