From: Tomas Babej Date: Fri, 26 Dec 2014 15:39:09 +0000 (+0100) Subject: Task: Detect modified fields by actual modifications X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/3c4a436d69fb02fca34be8f0189780d33ddbfe85?ds=inline;hp=351a4268660a1d24d7893b2e3ce8daa8f131f966 Task: Detect modified fields by actual modifications --- diff --git a/tasklib/task.py b/tasklib/task.py index 336c050..3860f8e 100644 --- a/tasklib/task.py +++ b/tasklib/task.py @@ -29,6 +29,7 @@ class TaskResource(object): def _load_data(self, data): self._data = data + self._original_data = data def __getitem__(self, key): hydrate_func = getattr(self, 'deserialize_{0}'.format(key), @@ -41,7 +42,6 @@ class TaskResource(object): dehydrate_func = getattr(self, 'serialize_{0}'.format(key), lambda x: x) self._data[key] = dehydrate_func(value) - self._modified_fields.add(key) def __str__(self): s = six.text_type(self.__unicode__()) @@ -107,7 +107,6 @@ class Task(TaskResource): kwargs.update(data) self._load_data(kwargs) - self._modified_fields = set() def __unicode__(self): return self['description'] @@ -118,6 +117,12 @@ class Task(TaskResource): def __hash__(self): return self['uuid'].__hash__() + @property + def _modified_fields(self): + for key in self._data.keys(): + if self._data.get(key) != self._original_data.get(key): + yield key + @property def completed(self): return self['status'] == six.text_type('completed') @@ -210,7 +215,6 @@ class Task(TaskResource): # Circumvent the ID storage, since ID is considered read-only self._data['id'] = int(id_lines[0].split(' ')[2].rstrip('.')) - self._modified_fields.clear() self.refresh() def add_annotation(self, annotation): @@ -269,8 +273,10 @@ class Task(TaskResource): to_update = dict( [(k, new_data.get(k)) for k in only_fields]) self._data.update(to_update) + self._original_data.update(to_update) else: self._data = new_data + self._original_data = new_data class TaskFilter(object):