diff options
| author |  OndrejIT <git@ondrej.it>
| 2016-04-25 21:40:15 +0200 |
|---|---|---|
| committer | OndrejIT <git@ondrej.it>
| 2016-04-25 21:40:15 +0200 |
| commit | aa785ddd8d64fa25bd1b0fe20eaa07d2c67b6837 (patch) | |
| tree | 1ce98bfa86be2216908bfcfeb0d8b4075e26dbee /module | |
| parent | Fix some incompatibilities with python 2.5 (diff) | |
| download | pyload-aa785ddd8d64fa25bd1b0fe20eaa07d2c67b6837.tar.xz | |
Fix SdilejCZ
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/accounts/CzshareCom.py | 14 | ||||
| -rw-r--r-- | module/plugins/hoster/CzshareCom.py | 10 |
2 files changed, 13 insertions, 11 deletions
diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py index 8852b5998..1aaedecfa 100644 --- a/module/plugins/accounts/CzshareCom.py +++ b/module/plugins/accounts/CzshareCom.py @@ -9,16 +9,18 @@ from module.plugins.internal.Account import Account class CzshareCom(Account): __name__ = "CzshareCom" __type__ = "account" - __version__ = "0.26" + __version__ = "0.27" __status__ = "testing" __description__ = """Czshare.com account plugin, now Sdilej.cz""" __license__ = "GPLv3" __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), - ("stickell", "l.stickell@yahoo.it")] + ("stickell", "l.stickell@yahoo.it"), + ("ondrej", "git@ondrej.it"),] - CREDIT_LEFT_PATTERN = r'<tr class="active">\s*<td>([\d ,]+) (KiB|MiB|GiB)</td>\s*<td>(.*?)</td>\s*</tr>' + CREDIT_LEFT_PATTERN = r'^\s+<div class="credit">\s+\n.+<strong>([\d,]+)(KB|MB|GB)</strong>\s+\n.+<!-- \.credit -->\s+$' + VALID_UNTIL_PATTERN = r'^\s+<tr class="active">\s+\n.+\n\s+<td>([\d\.: ]+)</td>\s+$' def grab_info(self, user, password, data): @@ -29,9 +31,11 @@ class CzshareCom(Account): html = self.load("http://sdilej.cz/prehled_kreditu/") try: - m = re.search(self.CREDIT_LEFT_PATTERN, html) + m = re.search(self.CREDIT_LEFT_PATTERN, html, re.MULTILINE) trafficleft = self.parse_traffic(m.group(1), m.group(2)) - validuntil = time.mktime(time.strptime(m.group(3), '%d.%m.%y %H:%M')) + + v = re.search(self.VALID_UNTIL_PATTERN, html, re.MULTILINE) + validuntil = time.mktime(time.strptime(v.group(1), '%d.%m.%y %H:%M')) except Exception, e: self.log_error(e, trace=True) diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py index 42a2ec02b..dff2f1611 100644 --- a/module/plugins/hoster/CzshareCom.py +++ b/module/plugins/hoster/CzshareCom.py @@ -1,7 +1,4 @@ # -*- coding: utf-8 -*- -# -# Test links: -# http://czshare.com/5278880/random.bin import re @@ -12,10 +9,10 @@ from module.plugins.internal.misc import parse_size class CzshareCom(SimpleHoster): __name__ = "CzshareCom" __type__ = "hoster" - __version__ = "1.08" + __version__ = "1.09" __status__ = "testing" - __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+' + __pattern__ = r'https?://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download\.php\?).+' __config__ = [("activated" , "bool", "Activated" , True), ("use_premium" , "bool", "Use premium account if available" , True), ("fallback" , "bool", "Fallback to free download if premium fails" , True), @@ -24,7 +21,8 @@ class CzshareCom(SimpleHoster): __description__ = """CZshare.com hoster plugin, now Sdilej.cz""" __license__ = "GPLv3" - __authors__ = [("zoidberg", "zoidberg@mujmail.cz")] + __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), + ("ondrej", "git@ondrej.it"),] NAME_PATTERN = r'<div class="tab" id="parameters">\s*<p>\s*Cel. n.zev: <a href=.*?>(?P<N>.+?)</a>' |