diff options
Diffstat (limited to 'module/plugins/accounts/UploadedTo.py')
| -rw-r--r-- | module/plugins/accounts/UploadedTo.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index e10b93e8d..ac1f3fd35 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -17,18 +17,20 @@ @author: mkaay """ -from module.plugins.Account import Account import re from time import time +from module.plugins.Account import Account + + class UploadedTo(Account): __name__ = "UploadedTo" - __version__ = "0.23" + __version__ = "0.26" __type__ = "account" __description__ = """ul.net account plugin""" __author_name__ = ("mkaay") __author_mail__ = ("mkaay@mkaay.de") - + def loadAccountInfo(self, user, req): req.load("http://uploaded.net/language/en") @@ -37,7 +39,7 @@ class UploadedTo(Account): premium = '<a href="register"><em>Premium</em>' in html or '<em>Premium</em></th>' in html if premium: - raw_traffic = re.search(r'<th colspan="2"><b class="cB">([^<]+)', html).group(1) + raw_traffic = re.search(r'<th colspan="2"><b class="cB">([^<]+)', html).group(1).replace('.', '') raw_valid = re.search(r"<td>Duration:</td>\s*<th>([^<]+)", html, re.MULTILINE).group(1).strip() traffic = int(self.parseTraffic(raw_traffic)) @@ -45,21 +47,22 @@ class UploadedTo(Account): if raw_valid == "unlimited": validuntil = -1 else: - raw_valid = re.findall(r"(\d+) (weeks|days|hours)", raw_valid) + raw_valid = re.findall(r"(\d+) (Week|weeks|days|day|hours|hour)", raw_valid) validuntil = time() for n, u in raw_valid: - validuntil += 3600 * int(n) * {"weeks": 168, "days": 24, "hours": 1}[u] + validuntil += 3600 * int(n) * {"Week": 168, "weeks": 168, "days": 24, + "day": 24, "hours": 1, "hour": 1}[u] - return {"validuntil":validuntil, "trafficleft":traffic, "maxtraffic":50*1024*1024} + return {"validuntil": validuntil, "trafficleft": traffic, "maxtraffic": 50 * 1024 * 1024} else: - return {"premium" : False, "validuntil" : -1} + return {"premium": False, "validuntil": -1} def login(self, user, data, req): req.load("http://uploaded.net/language/en") req.cj.setCookie("uploaded.net", "lang", "en") - - page = req.load("http://uploaded.net/io/login", post={ "id" : user, "pw" : data["password"], "_" : ""}) + + page = req.load("http://uploaded.net/io/login", post={"id": user, "pw": data["password"], "_": ""}) if "User and password do not match!" in page: self.wrongPassword() |