diff options
Diffstat (limited to 'module/plugins/accounts/YibaishiwuCom.py')
| -rw-r--r-- | module/plugins/accounts/YibaishiwuCom.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py index 33602a2fe..c5dda0921 100644 --- a/module/plugins/accounts/YibaishiwuCom.py +++ b/module/plugins/accounts/YibaishiwuCom.py @@ -2,13 +2,14 @@ import re -from module.plugins.Account import Account +from module.plugins.internal.Account import Account class YibaishiwuCom(Account): __name__ = "YibaishiwuCom" __type__ = "account" - __version__ = "0.02" + __version__ = "0.04" + __status__ = "testing" __description__ = """115.com account plugin""" __license__ = "GPLv3" @@ -18,23 +19,22 @@ class YibaishiwuCom(Account): ACCOUNT_INFO_PATTERN = r'var USER_PERMISSION = {(.*?)}' - def loadAccountInfo(self, user, req): - #self.relogin(user) - html = req.load("http://115.com/", decode=True) + def parse_info(self, user, password, data, req): + # self.relogin(user) + html = self.load("http://115.com/") m = re.search(self.ACCOUNT_INFO_PATTERN, html, re.S) premium = True if m and 'is_vip: 1' in m.group(1) else False validuntil = trafficleft = (-1 if m else 0) - return dict({"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium}) + return dict({'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}) - def login(self, user, data, req): - html = req.load("http://passport.115.com/?ac=login", - post={"back": "http://www.115.com/", - "goto": "http://115.com/", - "login[account]": user, - "login[passwd]": data['password']}, - decode=True) + def login(self, user, password, data, req): + html = self.load("https://passport.115.com/?ac=login", + post={'back' : "http://www.115.com/", + 'goto' : "http://115.com/", + "login[account]": user, + "login[passwd]" : password}) if not 'var USER_PERMISSION = {' in html: - self.wrongPassword() + self.login_fail() |