diff options
Diffstat (limited to 'module/datatypes')
| -rw-r--r-- | module/datatypes/PyFile.py | 7 | ||||
| -rw-r--r-- | module/datatypes/User.py | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/module/datatypes/PyFile.py b/module/datatypes/PyFile.py index bd335a05a..5f2be8769 100644 --- a/module/datatypes/PyFile.py +++ b/module/datatypes/PyFile.py @@ -16,7 +16,7 @@ # @author: RaNaN ############################################################################### -from time import sleep +from time import sleep, time from ReadWriteLock import ReadWriteLock from module.Api import ProgressInfo, DownloadProgress, FileInfo, DownloadInfo, DownloadStatus @@ -229,8 +229,11 @@ class PyFile(object): return 0 def getETA(self): - """ gets established time of arrival""" + """ gets established time of arrival / or waiting time""" try: + if self.status == DownloadStatus.Waiting: + return self.waitUntil - time() + return self.getBytesLeft() / self.getSpeed() except: return 0 diff --git a/module/datatypes/User.py b/module/datatypes/User.py index bdf52d860..da7fb90bf 100644 --- a/module/datatypes/User.py +++ b/module/datatypes/User.py @@ -17,7 +17,8 @@ ############################################################################### -from module.Api import UserData, Permission, Role, has_permission +from module.Api import UserData, Permission, Role +from module.utils import bits_set #TODO: activate user #noinspection PyUnresolvedReferences @@ -39,11 +40,10 @@ class User(UserData): def hasPermission(self, perms): """ Accepts permission bit or name """ - if isinstance(perms, basestring) and hasattr(Permission, perms): perms = getattr(Role, perms) - return has_permission(self.permission, perms) + return bits_set(perms, self.permission) def hasRole(self, role): if isinstance(role, basestring) and hasattr(Role, role): |