diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-12 16:33:20 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-12 16:33:20 +0200 |
| commit | 7be36a47327e273545673510a79a235e271cc448 (patch) | |
| tree | ee3cb38cbf619359132d4412189dbd2d2e8567bb /pyload/plugin/account | |
| parent | Other import fixes (3) (diff) | |
| parent | [SmoozedCom] Fix https://github.com/pyload/pyload/issues/1399 (2) (diff) | |
| download | pyload-7be36a47327e273545673510a79a235e271cc448.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
pyload/plugin/account/ShareonlineBiz.py
pyload/plugin/account/SmoozedCom.py
pyload/plugin/hoster/SmoozedCom.py
Diffstat (limited to 'pyload/plugin/account')
| -rw-r--r-- | pyload/plugin/account/ShareonlineBiz.py | 9 | ||||
| -rw-r--r-- | pyload/plugin/account/SmoozedCom.py | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pyload/plugin/account/ShareonlineBiz.py b/pyload/plugin/account/ShareonlineBiz.py index 97f45e0ab..81f96c014 100644 --- a/pyload/plugin/account/ShareonlineBiz.py +++ b/pyload/plugin/account/ShareonlineBiz.py @@ -8,7 +8,7 @@ from pyload.plugin.Account import Account class ShareonlineBiz(Account): __name = "ShareonlineBiz" __type = "account" - __version = "0.32" + __version = "0.33" __description = """Share-online.biz account plugin""" __license = "GPLv3" @@ -45,8 +45,11 @@ class ShareonlineBiz(Account): validuntil = float(api['expire_date']) traffic = float(api['traffic_1d'].split(";")[0]) - maxtraffic = max(maxtraffic, traffic) - trafficleft = maxtraffic - traffic + + if maxtraffic > traffic: + trafficleft = maxtraffic - traffic + else: + trafficleft = -1 return {'premium' : premium, 'validuntil' : validuntil, diff --git a/pyload/plugin/account/SmoozedCom.py b/pyload/plugin/account/SmoozedCom.py index f24799caf..63381c20b 100644 --- a/pyload/plugin/account/SmoozedCom.py +++ b/pyload/plugin/account/SmoozedCom.py @@ -28,7 +28,7 @@ from pyload.plugin.Account import Account class SmoozedCom(Account): __name = "SmoozedCom" __type = "account" - __version = "0.04" + __version = "0.05" __description = """Smoozed.com account plugin""" __license = "GPLv3" @@ -36,7 +36,6 @@ class SmoozedCom(Account): def loadAccountInfo(self, user, req): - # Get user data from premiumize.me status = self.getAccountStatus(user, req) self.logDebug(status) @@ -53,7 +52,10 @@ class SmoozedCom(Account): 'hosters' : [hoster['name'] for hoster in status['data']['hoster']]} if info['validuntil'] < time.time(): - info['premium'] = False + if float(status["data"]["user"].get("user_trial", 0)) > time.time(): + info['premium'] = True + else: + info['premium'] = False else: info['premium'] = True |