diff options
| author |  Stefano <l.stickell@yahoo.it>
| 2013-07-20 22:03:34 +0200 |
|---|---|---|
| committer | Stefano <l.stickell@yahoo.it>
| 2013-07-20 22:03:34 +0200 |
| commit | 4aa8241528f997509282bd9c8edbc83d7096d66a (patch) | |
| tree | 45148d014c8129c8cd1f2935adf49f9725280948 /pyload/plugins/accounts/UploadedTo.py | |
| parent | added missing init file (diff) | |
| parent | Using the same translatable string (diff) | |
| download | pyload-4aa8241528f997509282bd9c8edbc83d7096d66a.tar.xz | |
Merge plugins from stable
Conflicts:
module/plugins/hoster/UnrestrictLi.py
pyload/plugins/hooks/Captcha9kw.py
pyload/plugins/hoster/AlldebridCom.py
pyload/plugins/hoster/BitshareCom.py
pyload/plugins/hoster/EgoFilesCom.py
pyload/plugins/hoster/FreakshareCom.py
pyload/plugins/hoster/LuckyShareNet.py
pyload/plugins/hoster/Premium4Me.py
pyload/plugins/hoster/PremiumizeMe.py
pyload/plugins/hoster/RapidshareCom.py
pyload/plugins/hoster/RealdebridCom.py
pyload/plugins/hoster/ShareplaceCom.py
pyload/plugins/hoster/UploadedTo.py
pyload/plugins/hoster/UploadingCom.py
pyload/plugins/hoster/Xdcc.py
pyload/plugins/hoster/YourfilesTo.py
pyload/plugins/hoster/ZeveraCom.py
Diffstat (limited to 'pyload/plugins/accounts/UploadedTo.py')
| -rw-r--r-- | pyload/plugins/accounts/UploadedTo.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pyload/plugins/accounts/UploadedTo.py b/pyload/plugins/accounts/UploadedTo.py index e10b93e8d..d202018f2 100644 --- a/pyload/plugins/accounts/UploadedTo.py +++ b/pyload/plugins/accounts/UploadedTo.py @@ -23,7 +23,7 @@ from time import time class UploadedTo(Account): __name__ = "UploadedTo" - __version__ = "0.23" + __version__ = "0.26" __type__ = "account" __description__ = """ul.net account plugin""" __author_name__ = ("mkaay") @@ -37,7 +37,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,10 +45,10 @@ 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} else: |