X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/8f39904e76a1462d81fbe80e07a82bba11035cd8..fcd3eb3f048c5d722757429345d1b99b343a43f6:/tasklib/task.py?ds=sidebyside diff --git a/tasklib/task.py b/tasklib/task.py index 5eabc65..7c4cdff 100644 --- a/tasklib/task.py +++ b/tasklib/task.py @@ -13,6 +13,8 @@ DATE_FORMAT = '%Y%m%dT%H%M%SZ' REPR_OUTPUT_SIZE = 10 PENDING = 'pending' COMPLETED = 'completed' +DELETED = 'deleted' +WAITING = 'waiting' logger = logging.getLogger(__name__) @@ -165,6 +167,9 @@ class TaskAnnotation(TaskResource): # their data dics are the same return self.task == other.task and self._data == other._data + def __ne__(self, other): + return not self.__eq__(other) + __repr__ = __unicode__ @@ -277,6 +282,9 @@ class Task(TaskResource): # If the tasks are not saved, compare the actual instances return id(self) == id(other) + def __ne__(self, other): + return not self.__eq__(other) + def __hash__(self): if self['uuid']: # For saved Tasks, just define equality by equality of uuids @@ -301,6 +309,10 @@ class Task(TaskResource): def pending(self): return self['status'] == six.text_type('pending') + @property + def recurring(self): + return self['status'] == six.text_type('recurring') + @property def active(self): return self['start'] is not None @@ -504,6 +516,12 @@ class TaskQuerySet(object): def completed(self): return self.filter(status=COMPLETED) + def deleted(self): + return self.filter(status=DELETED) + + def waiting(self): + return self.filter(status=WAITING) + def filter(self, *args, **kwargs): """ Returns a new TaskQuerySet with the given filters added.