From 049298dbdbff33918454b03a3b072f418d47af97 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 6 Jun 2015 05:33:38 +0200 Subject: Use SSL when login account --- module/plugins/accounts/FreakshareCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/FreakshareCom.py') diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index ca3602a2c..19f159e3f 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -43,7 +43,7 @@ class FreakshareCom(Account): def login(self, user, data, req): req.load("http://freakshare.com/index.php?language=EN") - html = req.load("http://freakshare.com/login.html", + html = req.load("https://freakshare.com/login.html", post={"submit": "Login", "user": user, "pass": data['password']}, decode=True) -- cgit v1.2.3 From 0e1ef9bc01579328e17e79416fa3c1c7b77adcc8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 06:08:01 +0200 Subject: Update everything --- module/plugins/accounts/FreakshareCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/FreakshareCom.py') diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index 19f159e3f..83d26fbe5 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -3,13 +3,13 @@ import re import time -from module.plugins.Account import Account +from module.plugins.internal.Account import Account class FreakshareCom(Account): __name__ = "FreakshareCom" __type__ = "account" - __version__ = "0.13" + __version__ = "0.14" __description__ = """Freakshare.com account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From c1764e2fea0bb05164c83a876e8cd58b97f58f25 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 16 Jun 2015 17:31:38 +0200 Subject: Update all --- module/plugins/accounts/FreakshareCom.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'module/plugins/accounts/FreakshareCom.py') diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index 83d26fbe5..b33790071 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -21,7 +21,7 @@ class FreakshareCom(Account): validuntil = None trafficleft = None - html = req.load("http://freakshare.com/") + html = self.load("http://freakshare.com/", req=req) try: m = re.search(r'ltig bis:\s*([\d.:-]+)', html, re.M) @@ -41,11 +41,10 @@ class FreakshareCom(Account): def login(self, user, data, req): - req.load("http://freakshare.com/index.php?language=EN") + self.load("http://freakshare.com/index.php?language=EN", req=req) - html = req.load("https://freakshare.com/login.html", - post={"submit": "Login", "user": user, "pass": data['password']}, - decode=True) + html = self.load("https://freakshare.com/login.html", + post={"submit": "Login", "user": user, "pass": data['password']}, req=req) if ">Wrong Username or Password" in html: self.wrongPassword() -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/accounts/FreakshareCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/FreakshareCom.py') diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index b33790071..7548338f4 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -9,14 +9,14 @@ from module.plugins.internal.Account import Account class FreakshareCom(Account): __name__ = "FreakshareCom" __type__ = "account" - __version__ = "0.14" + __version__ = "0.15" __description__ = """Freakshare.com account plugin""" __license__ = "GPLv3" __authors__ = [("RaNaN", "RaNaN@pyload.org")] - def loadAccountInfo(self, user, req): + def load_account_info(self, user, req): premium = False validuntil = None trafficleft = None @@ -32,7 +32,7 @@ class FreakshareCom(Account): try: m = re.search(r'Traffic verbleibend:\s*([^<]+)', html, re.M) - trafficleft = self.parseTraffic(m.group(1)) + trafficleft = self.parse_traffic(m.group(1)) except Exception: pass @@ -47,4 +47,4 @@ class FreakshareCom(Account): post={"submit": "Login", "user": user, "pass": data['password']}, req=req) if ">Wrong Username or Password" in html: - self.wrongPassword() + self.wrong_password() -- cgit v1.2.3 From d2e2b127651a5a44b56337eb6d9ca246c97a208a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 17 Jul 2015 03:03:26 +0200 Subject: Spare fixes and code cosmetics --- module/plugins/accounts/FreakshareCom.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'module/plugins/accounts/FreakshareCom.py') diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index 7548338f4..c19ea7177 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -44,7 +44,10 @@ class FreakshareCom(Account): self.load("http://freakshare.com/index.php?language=EN", req=req) html = self.load("https://freakshare.com/login.html", - post={"submit": "Login", "user": user, "pass": data['password']}, req=req) + post={"submit": "Login", + "user" : user, + "pass" : data['password']}, + req=req) if ">Wrong Username or Password" in html: self.wrong_password() -- cgit v1.2.3 From 1f5a55ae2133a782bdcca334ecbcdbde50dbcf99 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 17 Jul 2015 15:29:48 +0200 Subject: No more need to use the req argument when call load method --- module/plugins/accounts/FreakshareCom.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/FreakshareCom.py') diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index c19ea7177..a06176a55 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -21,7 +21,7 @@ class FreakshareCom(Account): validuntil = None trafficleft = None - html = self.load("http://freakshare.com/", req=req) + html = self.load("http://freakshare.com/") try: m = re.search(r'ltig bis:\s*([\d.:-]+)', html, re.M) @@ -41,13 +41,12 @@ class FreakshareCom(Account): def login(self, user, data, req): - self.load("http://freakshare.com/index.php?language=EN", req=req) + self.load("http://freakshare.com/index.php?language=EN") html = self.load("https://freakshare.com/login.html", post={"submit": "Login", "user" : user, - "pass" : data['password']}, - req=req) + "pass" : data['password']}) if ">Wrong Username or Password" in html: self.wrong_password() -- cgit v1.2.3 From ff9383bfe06d14d23bc0ed6af79aa8967965d078 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 10:59:52 +0200 Subject: Code cosmetics (3) --- module/plugins/accounts/FreakshareCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/FreakshareCom.py') diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index a06176a55..5209fa630 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -37,16 +37,16 @@ class FreakshareCom(Account): except Exception: pass - return {"premium": premium, "validuntil": validuntil, "trafficleft": trafficleft} + return {'premium': premium, 'validuntil': validuntil, 'trafficleft': trafficleft} def login(self, user, data, req): self.load("http://freakshare.com/index.php?language=EN") html = self.load("https://freakshare.com/login.html", - post={"submit": "Login", - "user" : user, - "pass" : data['password']}) + post={'submit': "Login", + 'user' : user, + 'pass' : data['password']}) if ">Wrong Username or Password" in html: self.wrong_password() -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/accounts/FreakshareCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/FreakshareCom.py') diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index 5209fa630..46cea9d43 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -10,6 +10,7 @@ class FreakshareCom(Account): __name__ = "FreakshareCom" __type__ = "account" __version__ = "0.15" + __status__ = "stable" __description__ = """Freakshare.com account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/accounts/FreakshareCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/FreakshareCom.py') diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index 46cea9d43..46c70fe67 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -10,7 +10,7 @@ class FreakshareCom(Account): __name__ = "FreakshareCom" __type__ = "account" __version__ = "0.15" - __status__ = "stable" + __status__ = "testing" __description__ = """Freakshare.com account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 8f17f875f6e28f73ddb10da59c6464bd04922222 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Jul 2015 04:59:27 +0200 Subject: Account rewritten --- module/plugins/accounts/FreakshareCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/FreakshareCom.py') diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index 46c70fe67..404e60ee1 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -17,7 +17,7 @@ class FreakshareCom(Account): __authors__ = [("RaNaN", "RaNaN@pyload.org")] - def load_account_info(self, user, req): + def parse_info(self, user, password, data, req): premium = False validuntil = None trafficleft = None @@ -41,13 +41,13 @@ class FreakshareCom(Account): return {'premium': premium, 'validuntil': validuntil, 'trafficleft': trafficleft} - def login(self, user, data, req): + def login(self, user, password, data, req): self.load("http://freakshare.com/index.php?language=EN") html = self.load("https://freakshare.com/login.html", post={'submit': "Login", 'user' : user, - 'pass' : data['password']}) + 'pass' : password}) if ">Wrong Username or Password" in html: - self.wrong_password() + self.fail() -- cgit v1.2.3 From a95c217627a1cb651b24e69f20640df40797aff9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Jul 2015 09:34:18 +0200 Subject: Account rewritten (2) --- module/plugins/accounts/FreakshareCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/FreakshareCom.py') diff --git a/module/plugins/accounts/FreakshareCom.py b/module/plugins/accounts/FreakshareCom.py index 404e60ee1..a2f66f3b3 100644 --- a/module/plugins/accounts/FreakshareCom.py +++ b/module/plugins/accounts/FreakshareCom.py @@ -50,4 +50,4 @@ class FreakshareCom(Account): 'pass' : password}) if ">Wrong Username or Password" in html: - self.fail() + self.login_fail() -- cgit v1.2.3