From 5060e4c6374a5116d0d8b02528f910f8c5f8bcf9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 15 Jul 2014 16:25:41 +0200 Subject: Fix code indentation, some bad whitespaces and missing authors + use 'not' instead 'is None' + replace __pattern__'s r" with r' + other minor cosmetics --- module/plugins/accounts/OneFichierCom.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/OneFichierCom.py') diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index b10e34314..7c14f8191 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -12,11 +12,12 @@ class OneFichierCom(Account): __version__ = "0.1" __type__ = "account" __description__ = """1fichier.com account plugin""" - __author_name__ = ("Elrick69") - __author_mail__ = ("elrick69[AT]rocketmail[DOT]com") + __author_name__ = "Elrick69" + __author_mail__ = "elrick69[AT]rocketmail[DOT]com" VALID_UNTIL_PATTERN = r'You are a premium user until (?P\d{2})/(?P\d{2})/(?P\d{4})' + def loadAccountInfo(self, user, req): html = req.load("http://1fichier.com/console/abo.pl") -- cgit v1.2.3 From 7b8c458cca7d21a029620f98e453f746fce69cd1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 14 Jul 2014 16:10:01 +0200 Subject: Prefer single quote for dict key name --- module/plugins/accounts/OneFichierCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/OneFichierCom.py') diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 7c14f8191..22cbd51d3 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -40,7 +40,7 @@ class OneFichierCom(Account): html = req.load("http://1fichier.com/login.pl?lg=en", post={ "mail": user, - "pass": data["password"], + "pass": data['password'], "Login": "Login"}) if r'
Invalid username or password.
' in html: -- cgit v1.2.3 From 8e47b0de30a25d0fd5dfb518bfe4e1e7beff93fd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 15 Jul 2014 16:27:44 +0200 Subject: Key attributes cleanup for account, container and crypter plugins --- module/plugins/accounts/OneFichierCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/OneFichierCom.py') diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 22cbd51d3..be79423ef 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -11,6 +11,7 @@ class OneFichierCom(Account): __name__ = "OneFichierCom" __version__ = "0.1" __type__ = "account" + __description__ = """1fichier.com account plugin""" __author_name__ = "Elrick69" __author_mail__ = "elrick69[AT]rocketmail[DOT]com" -- cgit v1.2.3 From ba916633f2bedb04c7358000b91aed69f52e8e43 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 1 Aug 2014 19:35:59 +0200 Subject: Remove trailing whitespaces + remove license headers + import urllib methods directly + sort and fix key attributes + use save_join instead join + sort some import declarations + other minor code cosmetics --- module/plugins/accounts/OneFichierCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/OneFichierCom.py') diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index be79423ef..43dd1c2b6 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -9,8 +9,8 @@ from module.plugins.Account import Account class OneFichierCom(Account): __name__ = "OneFichierCom" - __version__ = "0.1" __type__ = "account" + __version__ = "0.1" __description__ = """1fichier.com account plugin""" __author_name__ = "Elrick69" -- cgit v1.2.3 From b0868ae6446078bacf1635dde5e4ab316b4a94cb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 18:57:59 +0200 Subject: New __authors__ key replaces __author_name__ and __author_mail__ + Whitespaces and EOF fixup --- module/plugins/accounts/OneFichierCom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/OneFichierCom.py') diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 43dd1c2b6..347aa0297 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -13,8 +13,8 @@ class OneFichierCom(Account): __version__ = "0.1" __description__ = """1fichier.com account plugin""" - __author_name__ = "Elrick69" - __author_mail__ = "elrick69[AT]rocketmail[DOT]com" + __authors__ = [("Elrick69", "elrick69[AT]rocketmail[DOT]com")] + VALID_UNTIL_PATTERN = r'You are a premium user until (?P\d{2})/(?P\d{2})/(?P\d{4})' -- cgit v1.2.3 From ae7a7e66981456e5bbe2b54006d79b6f907be7a4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 8 Oct 2014 20:18:13 +0200 Subject: Add __license__ key attribute to plugins --- module/plugins/accounts/OneFichierCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/OneFichierCom.py') diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 347aa0297..1e44ae2ca 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -13,6 +13,7 @@ class OneFichierCom(Account): __version__ = "0.1" __description__ = """1fichier.com account plugin""" + __license__ = "GPLv3" __authors__ = [("Elrick69", "elrick69[AT]rocketmail[DOT]com")] -- cgit v1.2.3 From 6a0fb7fdd4ea2749be44625225d8a235a78f032f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 11 Oct 2014 15:42:39 +0200 Subject: [accounts] Code cosmetics --- module/plugins/accounts/OneFichierCom.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/OneFichierCom.py') diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 1e44ae2ca..8e8430f61 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -36,6 +36,7 @@ class OneFichierCom(Account): return {"premium": premium, "trafficleft": -1, "validuntil": validuntil} + def login(self, user, data, req): req.http.c.setopt(REFERER, "http://1fichier.com/login.pl?lg=en") -- cgit v1.2.3 From 0eb6e7ec4a1144dcca824d8add049787d3da1762 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 22 Oct 2014 19:44:59 +0200 Subject: Two space before function declaration --- module/plugins/accounts/OneFichierCom.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'module/plugins/accounts/OneFichierCom.py') diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 8e8430f61..71fa550b6 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -21,7 +21,6 @@ class OneFichierCom(Account): def loadAccountInfo(self, user, req): - html = req.load("http://1fichier.com/console/abo.pl") m = re.search(self.VALID_UNTIL_PATTERN, html) @@ -38,7 +37,6 @@ class OneFichierCom(Account): def login(self, user, data, req): - req.http.c.setopt(REFERER, "http://1fichier.com/login.pl?lg=en") html = req.load("http://1fichier.com/login.pl?lg=en", post={ -- cgit v1.2.3 From 34984dae733c3f3d47b41a0acfba3724d53c65a1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 28 Oct 2014 16:52:10 +0100 Subject: Code cosmetics: plugin class attributes --- module/plugins/accounts/OneFichierCom.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/OneFichierCom.py') diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 71fa550b6..a95e4df34 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -8,13 +8,13 @@ from module.plugins.Account import Account class OneFichierCom(Account): - __name__ = "OneFichierCom" - __type__ = "account" + __name__ = "OneFichierCom" + __type__ = "account" __version__ = "0.1" __description__ = """1fichier.com account plugin""" - __license__ = "GPLv3" - __authors__ = [("Elrick69", "elrick69[AT]rocketmail[DOT]com")] + __license__ = "GPLv3" + __authors__ = [("Elrick69", "elrick69[AT]rocketmail[DOT]com")] VALID_UNTIL_PATTERN = r'You are a premium user until (?P\d{2})/(?P\d{2})/(?P\d{4})' -- cgit v1.2.3 From e8d1f1e6083dd7caa30dce97eeb5c6005c9f79f9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 4 Nov 2014 13:03:24 +0100 Subject: [OneFichierCom] Fixed account plugin --- module/plugins/accounts/OneFichierCom.py | 43 +++++++++++++++++++------------- 1 file changed, 25 insertions(+), 18 deletions(-) (limited to 'module/plugins/accounts/OneFichierCom.py') diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index a95e4df34..dae892c05 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- import re + from time import strptime, mktime + from pycurl import REFERER from module.plugins.Account import Account @@ -10,39 +12,44 @@ from module.plugins.Account import Account class OneFichierCom(Account): __name__ = "OneFichierCom" __type__ = "account" - __version__ = "0.1" + __version__ = "0.11" __description__ = """1fichier.com account plugin""" __license__ = "GPLv3" - __authors__ = [("Elrick69", "elrick69[AT]rocketmail[DOT]com")] + __authors__ = [("Elrick69", "elrick69[AT]rocketmail[DOT]com"), + ("Walter Purcaro", "vuolter@gmail.com")] - VALID_UNTIL_PATTERN = r'You are a premium user until (?P\d{2})/(?P\d{2})/(?P\d{4})' + VALID_UNTIL_PATTERN = r'Your Premium Status will end the (\d+/\d+/\d+)' def loadAccountInfo(self, user, req): - html = req.load("http://1fichier.com/console/abo.pl") + validuntil = None + trafficleft = -1 + premium = None - m = re.search(self.VALID_UNTIL_PATTERN, html) + html = req.load("https://1fichier.com/console/abo.pl") + m = re.search(self.VALID_UNTIL_PATTERN, html) if m: - premium = True - validuntil = re.sub(self.VALID_UNTIL_PATTERN, '\g/\g/\g', m.group(0)) - validuntil = int(mktime(strptime(validuntil, "%d/%m/%Y"))) - else: - premium = False - validuntil = -1 + expiredate = m.group(1) + self.logDebug("Expire date: " + expiredate) + + try: + validuntil = mktime(strptime(expiredate, "%d/%m/%Y")) + except Exception, e: + self.logError(str(e)) + else: + premium = True - return {"premium": premium, "trafficleft": -1, "validuntil": validuntil} + return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium or False} def login(self, user, data, req): - req.http.c.setopt(REFERER, "http://1fichier.com/login.pl?lg=en") + req.http.c.setopt(REFERER, "https://1fichier.com/login.pl?lg=en") - html = req.load("http://1fichier.com/login.pl?lg=en", post={ - "mail": user, - "pass": data['password'], - "Login": "Login"}) + html = req.load("https://1fichier.com/login.pl?lg=en", + post={'mail': user, 'pass': data['password'], 'It': "on", 'purge': "off", 'valider': "Send"}) - if r'
Invalid username or password.
' in html: + if '>Invalid email address' in html or '>Invalid password' in html: self.wrongPassword() -- cgit v1.2.3 From c9e31d875d32de31e54959b82bc35eff2b3e0f3f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 10 Nov 2014 00:19:51 +0100 Subject: Code cosmetics --- module/plugins/accounts/OneFichierCom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/OneFichierCom.py') diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index dae892c05..2f1c914c1 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -38,7 +38,7 @@ class OneFichierCom(Account): try: validuntil = mktime(strptime(expiredate, "%d/%m/%Y")) except Exception, e: - self.logError(str(e)) + self.logError(e) else: premium = True -- cgit v1.2.3