From 36e60a23497ae05736c24fed2f4ce936fb61f744 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 8 Jan 2015 23:31:33 +0100 Subject: "New Year" Update: account plugins --- module/plugins/accounts/RehostTo.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'module/plugins/accounts/RehostTo.py') diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py index 00a45dedd..660bef07e 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.11" + __version__ = "0.12" __description__ = """Rehost.to account plugin""" __license__ = "GPLv3" @@ -17,8 +17,10 @@ class RehostTo(Account): data = self.getAccountData(user) html = req.load("http://rehost.to/api.php", get={'cmd': "login", 'user': user, 'pass': data['password']}) + data = [x.split("=") for x in html.split(",")] - ses = data[0][1] + + ses = data[0][1] long_ses = data[1][1] html = req.load("http://rehost.to/api.php", @@ -39,7 +41,8 @@ class RehostTo(Account): def login(self, user, data, req): html = req.load("http://rehost.to/api.php", - get={'cmd': "login", 'user': user, 'pass': data['password']}) + get={'cmd': "login", 'user': user, 'pass': data['password']}, + decode=True) if "Login failed." in html: self.wrongPassword() -- cgit v1.2.3 From b617325d793a55d25f4812b1c6a7b9e656b9c73f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 10 Jan 2015 15:55:06 +0100 Subject: [RehostTo] Fix https://github.com/pyload/pyload/issues/1009 --- module/plugins/accounts/RehostTo.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'module/plugins/accounts/RehostTo.py') diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py index 660bef07e..4baefdc96 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.12" + __version__ = "0.13" __description__ = """Rehost.to account plugin""" __license__ = "GPLv3" @@ -18,25 +18,19 @@ class RehostTo(Account): html = req.load("http://rehost.to/api.php", get={'cmd': "login", 'user': user, 'pass': data['password']}) - data = [x.split("=") for x in html.split(",")] - - ses = data[0][1] - long_ses = data[1][1] + 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': long_ses}) + get={'cmd': "get_premium_credits", 'long_ses': session}) traffic, valid = html.split(",") trafficleft = self.parseTraffic(traffic + "MB") validuntil = float(valid) - account_info = {"trafficleft": trafficleft, - "validuntil" : validuntil, - "long_ses" : long_ses, - "ses" : ses} - - return account_info + return = {'trafficleft': trafficleft, + 'validuntil' : validuntil, + 'session' : session} def login(self, user, data, req): -- cgit v1.2.3 From 5ef9034367a02b7bbca8a482da22cdf7834e3ae0 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 10 Jan 2015 16:22:12 +0100 Subject: [RehostTo] Fix typo --- module/plugins/accounts/RehostTo.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/RehostTo.py') diff --git a/module/plugins/accounts/RehostTo.py b/module/plugins/accounts/RehostTo.py index 4baefdc96..25b66b88d 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.13" + __version__ = "0.14" __description__ = """Rehost.to account plugin""" __license__ = "GPLv3" @@ -28,9 +28,9 @@ class RehostTo(Account): trafficleft = self.parseTraffic(traffic + "MB") validuntil = float(valid) - return = {'trafficleft': trafficleft, - 'validuntil' : validuntil, - 'session' : session} + return {'trafficleft': trafficleft, + 'validuntil' : validuntil, + 'session' : session} def login(self, user, data, req): -- cgit v1.2.3 From 786c4fdf3b85ad086d57ecb7da2240c7a518af0d Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 10 Jan 2015 20:17:34 +0100 Subject: [RehostTo] Account fixup --- module/plugins/accounts/RehostTo.py | 48 +++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 18 deletions(-) (limited to 'module/plugins/accounts/RehostTo.py') 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() -- cgit v1.2.3