From 136f63dc39603814b215606f888fb2e639021277 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 26 Dec 2014 04:27:41 +0100 Subject: Spare code fixes --- module/plugins/accounts/ShareonlineBiz.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 596be9b7c..49afa12b8 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -16,7 +16,7 @@ class ShareonlineBiz(Account): def getUserAPI(self, user, req): return req.load("http://api.share-online.biz/account.php", - {"username": user, "password": self.accounts[user]['password'], "act": "userDetails"}) + get={"username": user, "password": self.accounts[user]['password'], 'act': "userDetails"}) def loadAccountInfo(self, user, req): @@ -34,9 +34,9 @@ class ShareonlineBiz(Account): if "a" in info and info['a'].lower() != "not_available": req.cj.setCookie("share-online.biz", "a", info['a']) - return {"validuntil": float(info['expire_date']) if "expire_date" in info else -1, + return {"validuntil" : float(info['expire_date']) if "expire_date" in info else -1, "trafficleft": -1, - "premium": True if ("dl" in info or "a" in info) and (info['group'] != "Sammler") else False} + "premium" : True if ("dl" in info or "a" in info) and (info['group'] != "Sammler") else False} def login(self, user, data, req): -- cgit v1.2.3 From a2324280a11b22ef75f7c86bad3392a2179c486c Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 26 Dec 2014 16:48:14 +0100 Subject: [ShareonlineBiz] Fix login --- module/plugins/accounts/ShareonlineBiz.py | 53 ++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 18 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 49afa12b8..c08d6f963 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -6,40 +6,57 @@ from module.plugins.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.25" + __version__ = "0.26" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" __authors__ = [("mkaay", "mkaay@mkaay.de"), - ("zoidberg", "zoidberg@mujmail.cz")] + ("zoidberg", "zoidberg@mujmail.cz"), + ("Walter Purcaro", "vuolter@gmail.com")] - def getUserAPI(self, user, req): - return req.load("http://api.share-online.biz/account.php", - get={"username": user, "password": self.accounts[user]['password'], 'act': "userDetails"}) + def api_response(self, user, req): + return req.load("http://api.share-online.biz/cgi-bin", + get={'q': "userdetails", 'aux': "traffic", "username": user, "password": self.accounts[user]['password']}) def loadAccountInfo(self, user, req): - html = self.getUserAPI(user, req) + premium = False + validuntil = None + trafficleft = -1 + maxtraffic = 100 * 1024 * 1024 * 1024 #: 100 GB - info = {} - for line in html.splitlines(): + api = {} + for line in self.api_response(user, req).splitlines(): if "=" in line: key, value = line.split("=") - info[key] = value - self.logDebug(info) + api[key] = value - if "dl" in info and info['dl'].lower() != "not_available": - req.cj.setCookie("share-online.biz", "dl", info['dl']) - if "a" in info and info['a'].lower() != "not_available": - req.cj.setCookie("share-online.biz", "a", info['a']) + self.logDebug(api) - return {"validuntil" : float(info['expire_date']) if "expire_date" in info else -1, - "trafficleft": -1, - "premium" : True if ("dl" in info or "a" in info) and (info['group'] != "Sammler") else False} + for key in ("dl", "a"): + if key not in api: + continue + + if api['group'] != "Sammler": + premium = True + + if api[key].lower() != "not_available": + req.cj.setCookie("share-online.biz", key, api[key]) + break + + if 'expire_date' in api: + validuntil = float(api['expire_date']) + + if 'traffic_1d' in api: + traffic = int(api['traffic_1d'].split(";")[0]) + maxtraffic = max(maxtraffic, traffic) + trafficleft = maxtraffic - traffic + + return {'premium': premium, 'validuntil': validuntil, 'trafficleft': trafficleft, 'maxtraffic': maxtraffic} def login(self, user, data, req): - html = self.getUserAPI(user, req) + html = self.api_response(user, req) if "EXCEPTION" in html: self.wrongPassword() -- cgit v1.2.3 From ff42cec46274b0f2019272424c1a57ec4b413507 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 26 Dec 2014 17:58:54 +0100 Subject: [PremiumTo] Fixup --- module/plugins/accounts/ShareonlineBiz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index c08d6f963..fea278559 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -49,7 +49,7 @@ class ShareonlineBiz(Account): validuntil = float(api['expire_date']) if 'traffic_1d' in api: - traffic = int(api['traffic_1d'].split(";")[0]) + traffic = float(api['traffic_1d'].split(";")[0]) maxtraffic = max(maxtraffic, traffic) trafficleft = maxtraffic - traffic -- cgit v1.2.3 From 993803c222f54a6ae0a12230a5e51789ec8ed564 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 27 Dec 2014 13:58:27 +0100 Subject: [ShareonlineBiz] Fix account wrong password recognition --- module/plugins/accounts/ShareonlineBiz.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index fea278559..056f14876 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -6,7 +6,7 @@ from module.plugins.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.26" + __version__ = "0.27" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" @@ -58,5 +58,7 @@ class ShareonlineBiz(Account): def login(self, user, data, req): html = self.api_response(user, req) - if "EXCEPTION" in html: + err = re.search(r'**(.+?)**', html) + if err: + self.logError(err.group(1)) self.wrongPassword() -- cgit v1.2.3 From 27f0f486bb859d25c49916d4131f882e1b5ba8dc Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 27 Dec 2014 21:13:09 +0100 Subject: [ShareonlineBiz] Account fixup --- module/plugins/accounts/ShareonlineBiz.py | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 056f14876..3f737896e 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -1,18 +1,18 @@ # -*- coding: utf-8 -*- +import re + from module.plugins.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.27" + __version__ = "0.28" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" - __authors__ = [("mkaay", "mkaay@mkaay.de"), - ("zoidberg", "zoidberg@mujmail.cz"), - ("Walter Purcaro", "vuolter@gmail.com")] + __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] def api_response(self, user, req): @@ -34,21 +34,13 @@ class ShareonlineBiz(Account): self.logDebug(api) - for key in ("dl", "a"): - if key not in api: - continue - - if api['group'] != "Sammler": - premium = True + if api['a'].lower() != "not_available": + req.cj.setCookie("share-online.biz", 'a', api['a']) - if api[key].lower() != "not_available": - req.cj.setCookie("share-online.biz", key, api[key]) - break + premium = api['group'] == "Premium" - if 'expire_date' in api: validuntil = float(api['expire_date']) - if 'traffic_1d' in api: traffic = float(api['traffic_1d'].split(";")[0]) maxtraffic = max(maxtraffic, traffic) trafficleft = maxtraffic - traffic @@ -58,7 +50,7 @@ class ShareonlineBiz(Account): def login(self, user, data, req): html = self.api_response(user, req) - err = re.search(r'**(.+?)**', html) + err = re.search(r'\*\*(.+?)\*\*', html) if err: self.logError(err.group(1)) self.wrongPassword() -- cgit v1.2.3 From cef160bb1a77a7a30aa9dde0d8c708e769bc0533 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 27 Dec 2014 23:37:03 +0100 Subject: [ShareonlineBiz] Account fixup (2) --- module/plugins/accounts/ShareonlineBiz.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 3f737896e..57fe52385 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -8,7 +8,7 @@ from module.plugins.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.28" + __version__ = "0.29" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" @@ -45,6 +45,9 @@ class ShareonlineBiz(Account): maxtraffic = max(maxtraffic, traffic) trafficleft = maxtraffic - traffic + maxtraffic /= 1024 #@TODO: Remove `/ 1024` in 0.4.10 + trafficleft /= 1024 #@TODO: Remove `/ 1024` in 0.4.10 + return {'premium': premium, 'validuntil': validuntil, 'trafficleft': trafficleft, 'maxtraffic': maxtraffic} -- cgit v1.2.3 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/ShareonlineBiz.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 57fe52385..3ee6e04af 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -8,7 +8,7 @@ from module.plugins.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.29" + __version__ = "0.30" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" @@ -17,7 +17,10 @@ class ShareonlineBiz(Account): def api_response(self, user, req): return req.load("http://api.share-online.biz/cgi-bin", - get={'q': "userdetails", 'aux': "traffic", "username": user, "password": self.accounts[user]['password']}) + get={'q' : "userdetails", + 'aux' : "traffic", + 'username': user, + 'password': self.getAccountData(user)['password']}) def loadAccountInfo(self, user, req): -- cgit v1.2.3 From 1fcd7609edb84191607d062ea26fde6707fd2305 Mon Sep 17 00:00:00 2001 From: Markus Schanz Date: Wed, 28 Jan 2015 23:04:26 +0100 Subject: ShareOnline: Handle PrePaid accounts as if they were Premium Accounts --- module/plugins/accounts/ShareonlineBiz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 3ee6e04af..08353d036 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -40,7 +40,7 @@ class ShareonlineBiz(Account): if api['a'].lower() != "not_available": req.cj.setCookie("share-online.biz", 'a', api['a']) - premium = api['group'] == "Premium" + premium = api['group'] in ["Premium", "PrePaid"] validuntil = float(api['expire_date']) -- cgit v1.2.3 From 436d9f34b6d29789d7f329304e2fcfc66a52756f Mon Sep 17 00:00:00 2001 From: Coksnuss Date: Wed, 28 Jan 2015 23:17:58 +0100 Subject: Update ShareonlineBiz.py Plugin version increased --- module/plugins/accounts/ShareonlineBiz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 08353d036..e15f0f383 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -8,7 +8,7 @@ from module.plugins.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.30" + __version__ = "0.31" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 862e1a5d0e144dfd1eb6320992f6f7a646659c2f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 29 Jan 2015 00:00:19 +0100 Subject: [YoutubeCom] Fix http://forum.pyload.org/viewtopic.php?f=12&t=3974 --- module/plugins/accounts/ShareonlineBiz.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index e15f0f383..7e05e2e76 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -40,7 +40,7 @@ class ShareonlineBiz(Account): if api['a'].lower() != "not_available": req.cj.setCookie("share-online.biz", 'a', api['a']) - premium = api['group'] in ["Premium", "PrePaid"] + premium = api['group'] in ("Premium", "PrePaid") validuntil = float(api['expire_date']) @@ -51,7 +51,10 @@ class ShareonlineBiz(Account): maxtraffic /= 1024 #@TODO: Remove `/ 1024` in 0.4.10 trafficleft /= 1024 #@TODO: Remove `/ 1024` in 0.4.10 - return {'premium': premium, 'validuntil': validuntil, 'trafficleft': trafficleft, 'maxtraffic': maxtraffic} + return {'premium' : premium, + 'validuntil' : validuntil, + 'trafficleft': trafficleft, + 'maxtraffic' : maxtraffic} def login(self, user, data, req): -- cgit v1.2.3 From c9b050782d09453d6f85154d2b261719ba69cf00 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 8 May 2015 17:34:54 +0200 Subject: [ShareonlineBiz] Fix https://github.com/pyload/pyload/issues/1403 --- module/plugins/accounts/ShareonlineBiz.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 7e05e2e76..8b32ab54d 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -8,7 +8,7 @@ from module.plugins.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.31" + __version__ = "0.32" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" @@ -40,7 +40,7 @@ class ShareonlineBiz(Account): if api['a'].lower() != "not_available": req.cj.setCookie("share-online.biz", 'a', api['a']) - premium = api['group'] in ("Premium", "PrePaid") + premium = api['group'] in ("PrePaid", "Premium", "Penalty-Premium") validuntil = float(api['expire_date']) -- cgit v1.2.3 From c86a4ead904d3bb772338a3bf6024260d2bac121 Mon Sep 17 00:00:00 2001 From: Micha Jay Date: Mon, 11 May 2015 15:13:54 +0200 Subject: change trafficleft to unlimited when in Penalty-Premium state to ensure continues Downloads --- module/plugins/accounts/ShareonlineBiz.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 8b32ab54d..27371864e 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -45,8 +45,11 @@ class ShareonlineBiz(Account): validuntil = float(api['expire_date']) traffic = float(api['traffic_1d'].split(";")[0]) - maxtraffic = max(maxtraffic, traffic) - trafficleft = maxtraffic - traffic + + if maxtraffic > traffic: + trafficleft = maxtraffic - traffic + else: + trafficleft = -1 maxtraffic /= 1024 #@TODO: Remove `/ 1024` in 0.4.10 trafficleft /= 1024 #@TODO: Remove `/ 1024` in 0.4.10 -- cgit v1.2.3 From 6faf688fdd1657826d0db99fd9ff4f9c94582721 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 11 May 2015 20:10:40 +0200 Subject: [ShareonlineBiz][SmoozedCom] Version up --- module/plugins/accounts/ShareonlineBiz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 27371864e..4214b4401 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -8,7 +8,7 @@ from module.plugins.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.32" + __version__ = "0.33" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" -- cgit v1.2.3