diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-10-04 04:29:58 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-10-04 04:29:58 +0200 |
| commit | 1c7d9e55ffbfc9204c9e9246d9cc64806fa38326 (patch) | |
| tree | 49fff3f3b5b2c036c99c1422b9d0153a6c80f0cd /module/plugins/accounts | |
| parent | Fix https://github.com/pyload/pyload/issues/1911#issuecomment-145026557 (diff) | |
| download | pyload-1c7d9e55ffbfc9204c9e9246d9cc64806fa38326.tar.xz | |
Fixpack (2)
Diffstat (limited to 'module/plugins/accounts')
| -rw-r--r-- | module/plugins/accounts/CzshareCom.py | 4 | ||||
| -rw-r--r-- | module/plugins/accounts/HellshareCz.py | 2 | ||||
| -rw-r--r-- | module/plugins/accounts/UploadedTo.py | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/module/plugins/accounts/CzshareCom.py b/module/plugins/accounts/CzshareCom.py index 209a94f60..0c60e64d0 100644 --- a/module/plugins/accounts/CzshareCom.py +++ b/module/plugins/accounts/CzshareCom.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class CzshareCom(Account): __name__ = "CzshareCom" __type__ = "account" - __version__ = "0.23" + __version__ = "0.24" __status__ = "testing" __description__ = """Czshare.com account plugin, now Sdilej.cz""" @@ -30,7 +30,7 @@ class CzshareCom(Account): try: m = re.search(self.CREDIT_LEFT_PATTERN, html) - trafficleft = self.parse_traffic(m.group(1), m.group(2) + trafficleft = self.parse_traffic(m.group(1), m.group(2)) validuntil = time.mktime(time.strptime(m.group(3), '%d.%m.%y %H:%M')) except Exception, e: diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py index a552a03b6..5423b212f 100644 --- a/module/plugins/accounts/HellshareCz.py +++ b/module/plugins/accounts/HellshareCz.py @@ -59,7 +59,7 @@ class HellshareCz(Account): self.log_debug("Switch lang - URL: %s" % self.req.lastEffectiveURL) json = self.load("%s?do=locRouter-show" % self.req.lastEffectiveURL) - hash = re.search(r"(\-\-[0-9a-f]+\-)", json).group(1) + hash = re.search(r"(--[0-9a-f]+-)", json).group(1) self.log_debug("Switch lang - HASH: %s" % hash) diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index 9c3369bd8..1e92195a1 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account class UploadedTo(Account): __name__ = "UploadedTo" __type__ = "account" - __version__ = "0.37" + __version__ = "0.38" __status__ = "testing" __description__ = """Uploaded.to account plugin""" @@ -51,12 +51,7 @@ class UploadedTo(Account): traffic = m.groupdict() size = traffic['S'].replace('.', '') unit = traffic['U'].lower() - - if unit.startswith('t'): #@NOTE: Remove in 0.4.10 - trafficleft = float(size.replace(',', '.')) / 1024 - trafficleft *= 1 << 40 - else: - trafficleft = self.parse_traffic(size, unit) + trafficleft = self.parse_traffic(size, unit) return {'validuntil' : validuntil, 'trafficleft': trafficleft, |