diff options
Diffstat (limited to 'module/plugins/accounts/FilerNet.py')
| -rw-r--r-- | module/plugins/accounts/FilerNet.py | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/module/plugins/accounts/FilerNet.py b/module/plugins/accounts/FilerNet.py index ac5fd11da..674c7a5dd 100644 --- a/module/plugins/accounts/FilerNet.py +++ b/module/plugins/accounts/FilerNet.py @@ -3,57 +3,57 @@ import re import time -from module.plugins.Account import Account +from module.plugins.internal.Account import Account class FilerNet(Account): __name__ = "FilerNet" __type__ = "account" - __version__ = "0.04" + __version__ = "0.07" + __status__ = "testing" __description__ = """Filer.net account plugin""" __license__ = "GPLv3" __authors__ = [("stickell", "l.stickell@yahoo.it")] - TOKEN_PATTERN = r'_csrf_token" value="(.+?)" />' + TOKEN_PATTERN = r'name="_csrf_token" value="(.+?)"' WALID_UNTIL_PATTERN = r'Der Premium-Zugang ist gültig bis (.+)\.\s*</td>' TRAFFIC_PATTERN = r'Traffic</th>\s*<td>([^<]+)</td>' FREE_PATTERN = r'Account Status</th>\s*<td>\s*Free' - def loadAccountInfo(self, user, req): - html = req.load("https://filer.net/profile") + def parse_info(self, user, password, data, req): + html = self.load("https://filer.net/profile") - # Free user + #: Free user if re.search(self.FREE_PATTERN, html): - return {"premium": False, "validuntil": None, "trafficleft": None} + return {'premium': False, 'validuntil': None, 'trafficleft': None} until = re.search(self.WALID_UNTIL_PATTERN, html) traffic = re.search(self.TRAFFIC_PATTERN, html) if until and traffic: validuntil = time.mktime(time.strptime(until.group(1), "%d.%m.%Y %H:%M:%S")) - trafficleft = self.parseTraffic(traffic.group(1)) - return {"premium": True, "validuntil": validuntil, "trafficleft": trafficleft} + trafficleft = self.parse_traffic(traffic.group(1)) + return {'premium': True, 'validuntil': validuntil, 'trafficleft': trafficleft} else: - self.logError(_("Unable to retrieve account information")) - return {"premium": False, "validuntil": None, "trafficleft": None} + self.log_error(_("Unable to retrieve account information")) + return {'premium': False, 'validuntil': None, 'trafficleft': None} - def login(self, user, data, req): - html = req.load("https://filer.net/login") + def login(self, user, password, data, req): + html = self.load("https://filer.net/login") token = re.search(self.TOKEN_PATTERN, html).group(1) - html = req.load("https://filer.net/login_check", - post={"_username": user, - "_password": data['password'], - "_remember_me": "on", - "_csrf_token": token, - "_target_path": "https://filer.net/"}, - decode=True) + html = self.load("https://filer.net/login_check", + post={'_username' : user, + '_password' : password, + '_remember_me': "on", + '_csrf_token' : token, + '_target_path': "https://filer.net/"}) if 'Logout' not in html: - self.wrongPassword() + self.login_fail() |