From 68248f809d1cad27c10bac1e84afb52d5bf49ed0 Mon Sep 17 00:00:00 2001 From: zoidberg10 Date: Sat, 10 Dec 2011 00:12:58 +0100 Subject: megaupload #451, uploadedto #443 --- module/plugins/accounts/UploadedTo.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 0bc7c2fd0..b4d194396 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -23,7 +23,7 @@ from time import time class UploadedTo(Account): __name__ = "UploadedTo" - __version__ = "0.2" + __version__ = "0.21" __type__ = "account" __description__ = """ul.to account plugin""" __author_name__ = ("mkaay") @@ -45,8 +45,10 @@ class UploadedTo(Account): if raw_valid == "unlimited": validuntil = -1 else: - raw_valid = re.findall(r"\d+", raw_valid) - validuntil = time() + 24 * 60 * 60 * int(raw_valid[0]) + 60 * 60 * int(raw_valid[1]) + raw_valid = re.findall(r"(\d+) (weeks|days|hours)", raw_valid) + validuntil = time() + for n, u in raw_valid: + validuntil += 3600 * int(n) * {"weeks": 168, "days": 24, "hours": 1}[u] return {"validuntil":validuntil, "trafficleft":traffic, "maxtraffic":50*1024*1024} else: -- cgit v1.2.3