diff options
Diffstat (limited to 'module/plugins/accounts/UploadedTo.py')
| -rw-r--r-- | module/plugins/accounts/UploadedTo.py | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index d1556b6db..59d3fcff9 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -3,30 +3,33 @@ import re import time -from module.plugins.Account import Account +from module.plugins.internal.Account import Account class UploadedTo(Account): __name__ = "UploadedTo" __type__ = "account" - __version__ = "0.30" + __version__ = "0.35" + __status__ = "testing" __description__ = """Uploaded.to account plugin""" __license__ = "GPLv3" __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - PREMIUM_PATTERN = r'<em>Premium</em>' - VALID_UNTIL_PATTERN = r'<td>Duration:</td>\s*<th>(.+?)<' + COOKIES = False + + PREMIUM_PATTERN = r'<em>Premium</em>' + VALID_UNTIL_PATTERN = r'<td>Duration:</td>\s*<th>(.+?)<' TRAFFIC_LEFT_PATTERN = r'<b class="cB">(?P<S>[\d.,]+) (?P<U>[\w^_]+)' - def loadAccountInfo(self, user, req): + def parse_info(self, user, password, data, req): validuntil = None trafficleft = None premium = None - html = req.load("http://uploaded.net/me") + html = self.load("http://uploaded.net/me") premium = True if re.search(self.PREMIUM_PATTERN, html) else False @@ -53,19 +56,20 @@ class UploadedTo(Account): trafficleft = float(size.replace(',', '.')) / 1024 trafficleft *= 1 << 40 else: - trafficleft = self.parseTraffic(size + unit) + trafficleft = self.parse_traffic(size + unit) return {'validuntil' : validuntil, 'trafficleft': trafficleft, 'premium' : premium} - def login(self, user, data, req): - # req.cj.setCookie("uploaded.net", "lang", "en") + def login(self, user, password, data, req): + self.load("http://uploaded.net/language/en") - html = req.load("http://uploaded.net/io/login", - post={'id': user, 'pw': data['password'], '_': ""}, - decode=True) + html = self.load("http://uploaded.net/io/login", + post={'id': user, + 'pw': password}) - if '"err"' in html: - self.wrongPassword() + m = re.search(r'"err":"(.+?)"', html) + if m is not None: + self.login_fail(m.group(1)) |