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/FshareVn.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/FshareVn.py') diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index 7fcf88f20..08d5fe555 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -3,13 +3,13 @@ import re import time -from module.plugins.Account import Account +from module.plugins.internal.Account import Account class FshareVn(Account): __name__ = "FshareVn" __type__ = "account" - __version__ = "0.09" + __version__ = "0.10" __description__ = """Fshare.vn 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/FshareVn.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/FshareVn.py') diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index 08d5fe555..67aafae86 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -24,7 +24,7 @@ class FshareVn(Account): def loadAccountInfo(self, user, req): - html = req.load("http://www.fshare.vn/account_info.php", decode=True) + html = self.load("http://www.fshare.vn/account_info.php", req=req) if re.search(self.LIFETIME_PATTERN, html): self.logDebug("Lifetime membership detected") @@ -45,13 +45,12 @@ class FshareVn(Account): def login(self, user, data, req): - html = req.load("https://www.fshare.vn/login.php", + html = self.load("https://www.fshare.vn/login.php", post={'LoginForm[email]' : user, 'LoginForm[password]' : data['password'], 'LoginForm[rememberMe]': 1, 'yt0' : "Login"}, - referer=True, - decode=True) + referer=True, req=req) if not re.search(r' Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/accounts/FshareVn.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'module/plugins/accounts/FshareVn.py') diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index 67aafae86..3149d6548 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class FshareVn(Account): __name__ = "FshareVn" __type__ = "account" - __version__ = "0.10" + __version__ = "0.11" __description__ = """Fshare.vn account plugin""" __license__ = "GPLv3" @@ -23,19 +23,19 @@ class FshareVn(Account): DIRECT_DOWNLOAD_PATTERN = ur']*)[^>]*/>Kích hoạt download trực tiếp' - def loadAccountInfo(self, user, req): + def load_account_info(self, user, req): html = self.load("http://www.fshare.vn/account_info.php", req=req) if re.search(self.LIFETIME_PATTERN, html): - self.logDebug("Lifetime membership detected") - trafficleft = self.getTrafficLeft() + self.log_debug("Lifetime membership detected") + trafficleft = self.get_traffic_left() return {"validuntil": -1, "trafficleft": trafficleft, "premium": True} m = re.search(self.VALID_UNTIL_PATTERN, html) if m: premium = True validuntil = time.mktime(time.strptime(m.group(1), '%I:%M:%S %p %d-%m-%Y')) - trafficleft = self.getTrafficLeft() + trafficleft = self.get_traffic_left() else: premium = False validuntil = None @@ -53,9 +53,9 @@ class FshareVn(Account): referer=True, req=req) if not re.search(r' Date: Fri, 17 Jul 2015 03:03:26 +0200 Subject: Spare fixes and code cosmetics --- module/plugins/accounts/FshareVn.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/accounts/FshareVn.py') diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index 3149d6548..f0891af9e 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -46,11 +46,11 @@ class FshareVn(Account): def login(self, user, data, req): html = self.load("https://www.fshare.vn/login.php", - post={'LoginForm[email]' : user, - 'LoginForm[password]' : data['password'], - 'LoginForm[rememberMe]': 1, - 'yt0' : "Login"}, - referer=True, req=req) + post={'LoginForm[email]' : user, + 'LoginForm[password]' : data['password'], + 'LoginForm[rememberMe]': 1, + 'yt0' : "Login"}, + req=req) if not re.search(r' 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/FshareVn.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/plugins/accounts/FshareVn.py') diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index f0891af9e..aefc76e41 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -24,7 +24,7 @@ class FshareVn(Account): def load_account_info(self, user, req): - html = self.load("http://www.fshare.vn/account_info.php", req=req) + html = self.load("http://www.fshare.vn/account_info.php") if re.search(self.LIFETIME_PATTERN, html): self.log_debug("Lifetime membership detected") @@ -49,8 +49,7 @@ class FshareVn(Account): post={'LoginForm[email]' : user, 'LoginForm[password]' : data['password'], 'LoginForm[rememberMe]': 1, - 'yt0' : "Login"}, - req=req) + 'yt0' : "Login"}) if not re.search(r' Date: Sun, 19 Jul 2015 10:59:52 +0200 Subject: Code cosmetics (3) --- module/plugins/accounts/FshareVn.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/FshareVn.py') diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index aefc76e41..809807fdb 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -29,7 +29,7 @@ class FshareVn(Account): if re.search(self.LIFETIME_PATTERN, html): self.log_debug("Lifetime membership detected") trafficleft = self.get_traffic_left() - return {"validuntil": -1, "trafficleft": trafficleft, "premium": True} + return {'validuntil': -1, 'trafficleft': trafficleft, 'premium': True} m = re.search(self.VALID_UNTIL_PATTERN, html) if m: @@ -41,7 +41,7 @@ class FshareVn(Account): validuntil = None trafficleft = None - return {"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium} + return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium} def login(self, user, data, req): -- 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/FshareVn.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/FshareVn.py') diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index 809807fdb..673f93904 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -10,6 +10,7 @@ class FshareVn(Account): __name__ = "FshareVn" __type__ = "account" __version__ = "0.11" + __status__ = "stable" __description__ = """Fshare.vn 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/FshareVn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/FshareVn.py') diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index 673f93904..1e2cd5293 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -10,7 +10,7 @@ class FshareVn(Account): __name__ = "FshareVn" __type__ = "account" __version__ = "0.11" - __status__ = "stable" + __status__ = "testing" __description__ = """Fshare.vn 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/FshareVn.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/FshareVn.py') diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index 1e2cd5293..7d7359fd0 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -24,7 +24,7 @@ class FshareVn(Account): DIRECT_DOWNLOAD_PATTERN = ur']*)[^>]*/>Kích hoạt download trực tiếp' - def load_account_info(self, user, req): + def parse_info(self, user, password, data, req): html = self.load("http://www.fshare.vn/account_info.php") if re.search(self.LIFETIME_PATTERN, html): @@ -45,15 +45,15 @@ class FshareVn(Account): return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium} - def login(self, user, data, req): + def login(self, user, password, data, req): html = self.load("https://www.fshare.vn/login.php", post={'LoginForm[email]' : user, - 'LoginForm[password]' : data['password'], + 'LoginForm[password]' : password, 'LoginForm[rememberMe]': 1, 'yt0' : "Login"}) if not re.search(r' Date: Sat, 25 Jul 2015 09:34:18 +0200 Subject: Account rewritten (2) --- module/plugins/accounts/FshareVn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/FshareVn.py') diff --git a/module/plugins/accounts/FshareVn.py b/module/plugins/accounts/FshareVn.py index 7d7359fd0..bc8ced5e2 100644 --- a/module/plugins/accounts/FshareVn.py +++ b/module/plugins/accounts/FshareVn.py @@ -53,7 +53,7 @@ class FshareVn(Account): 'yt0' : "Login"}) if not re.search(r'