summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-28 17:08:59 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-28 17:08:59 +0200
commitbabf7f311d257d621a101b2d44e74c8e562629bd (patch)
tree202f619a729ac24b2e5fef84c082de74418b45c2 /module
parentFix https://github.com/pyload/pyload/issues/1577 and https://github.com/pyloa... (diff)
downloadpyload-babf7f311d257d621a101b2d44e74c8e562629bd.tar.xz
Fix https://github.com/pyload/pyload/issues/1578
Diffstat (limited to 'module')
-rw-r--r--module/plugins/internal/Account.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/module/plugins/internal/Account.py b/module/plugins/internal/Account.py
index 766fe3f71..15078b100 100644
--- a/module/plugins/internal/Account.py
+++ b/module/plugins/internal/Account.py
@@ -14,7 +14,7 @@ from module.utils import compare_time, lock, parseFileSize as parse_size
class Account(Plugin):
__name__ = "Account"
__type__ = "account"
- __version__ = "0.07"
+ __version__ = "0.08"
__status__ = "testing"
__description__ = """Base account plugin"""
@@ -327,7 +327,7 @@ class Account(Plugin):
if data['trafficleft'] == 0:
continue
- if data['validuntil'] > 0 and time.time() > data['validuntil']:
+ if time.time() > data['validuntil'] > 0:
continue
if data['premium']:
@@ -337,7 +337,7 @@ class Account(Plugin):
free_accounts.append((user, info))
all_accounts = premium_accounts or free_accounts
- fav_accounts = [(user, info) for user, info in all_accounts if info['validuntil'] is not None]
+ fav_accounts = [(user, info) for user, info in all_accounts if info['data']['validuntil'] is not None]
accounts = sorted(fav_accounts or all_accounts,
key=itemgetter("validuntil"), reverse=True) or [(None, None)]