From: Tomas Babej Date: Thu, 15 Jan 2015 15:13:25 +0000 (+0100) Subject: Merge pull request #19 from robgolding63/deserialized-data-dict X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/336f586512208dc74ed72741c4ced644f79c6f87?hp=6855958d83f2a0b2580e68744df7cc5f9a967391 Merge pull request #19 from robgolding63/deserialized-data-dict Store deserialized data in Task._data --- diff --git a/tasklib/task.py b/tasklib/task.py index b6c3d09..1ab6347 100644 --- a/tasklib/task.py +++ b/tasklib/task.py @@ -93,9 +93,9 @@ class SerializingObject(object): return ','.join(tags) if tags else '' def deserialize_tags(self, tags): - if isinstance(tags, basestring): + if isinstance(tags, six.string_types): return tags.split(',') if tags else [] - return tags + return tags or [] def serialize_depends(self, cur_dependencies): # Return the list of uuids @@ -111,11 +111,11 @@ class TaskResource(SerializingObject): read_only_fields = [] def _load_data(self, data): - self._data = data + self._data = dict((key, self._deserialize(key, value)) + for key, value in data.items()) # We need to use a copy for original data, so that changes - # are not propagated. Shallow copy is alright, since data dict uses only - # primitive data types - self._original_data = data.copy() + # are not propagated. + self._original_data = copy.deepcopy(self._data) def _update_data(self, data, update_original=False): """ @@ -123,11 +123,12 @@ class TaskResource(SerializingObject): updates should already be serialized. If update_original is True, the original_data dict is updated as well. """ - - self._data.update(data) + self._data.update(dict((key, self._deserialize(key, value)) + for key, value in data.items())) if update_original: - self._original_data.update(data) + self._original_data = copy.deepcopy(self._data) + def __getitem__(self, key): # This is a workaround to make TaskResource non-iterable @@ -138,12 +139,15 @@ class TaskResource(SerializingObject): except ValueError: pass - return self._deserialize(key, self._data.get(key)) + if key not in self._data: + self._data[key] = self._deserialize(key, None) + + return self._data.get(key) def __setitem__(self, key, value): if key in self.read_only_fields: raise RuntimeError('Field \'%s\' is read-only' % key) - self._data[key] = self._serialize(key, value) + self._data[key] = value def __str__(self): s = six.text_type(self.__unicode__()) @@ -168,6 +172,11 @@ class TaskAnnotation(TaskResource): def __unicode__(self): return self['description'] + def __eq__(self, other): + # consider 2 annotations equal if they belong to the same task, and + # their data dics are the same + return self.task == other.task and self._data == other._data + __repr__ = __unicode__ @@ -239,6 +248,10 @@ class Task(TaskResource): if self._data.get(key) != self._original_data.get(key): yield key + @property + def _is_modified(self): + return bool(list(self._modified_fields)) + @property def completed(self): return self['status'] == six.text_type('completed') @@ -276,8 +289,7 @@ class Task(TaskResource): # to keep a list of all depedencies in the _data dictionary, # not just currently added/removed ones - old_dependencies_raw = self._original_data.get('depends','') - old_dependencies = self.deserialize_depends(old_dependencies_raw) + old_dependencies = self._original_data.get('depends', set()) added = self['depends'] - old_dependencies removed = old_dependencies - self['depends'] @@ -330,6 +342,9 @@ class Task(TaskResource): self.refresh(only_fields=['status']) def save(self): + if self.saved and not self._is_modified: + return + args = [self['uuid'], 'modify'] if self.saved else ['add'] args.extend(self._get_modified_fields_as_args()) output = self.warrior.execute_command(args) @@ -372,13 +387,14 @@ class Task(TaskResource): def add_field(field): # Add the output of format_field method to args list (defaults to - # field:'value') - format_default = lambda k: "{0}:{1}".format(k, - "'{0}'".format(self._data[k]) - if self._data[k] is not None - else '') + # field:value) + serialized_value = self._serialize(field, self._data[field]) or '' + format_default = lambda: "{0}:{1}".format( + field, + "'{0}'".format(serialized_value) if serialized_value else '' + ) format_func = getattr(self, 'format_{0}'.format(field), - lambda: format_default(field)) + format_default) args.append(format_func()) # If we're modifying saved task, simply pass on all modified fields diff --git a/tasklib/tests.py b/tasklib/tests.py index 6d67a12..8fc5753 100644 --- a/tasklib/tests.py +++ b/tasklib/tests.py @@ -181,9 +181,9 @@ class TaskTest(TasklibTest): # We only save the parent task, dependency task is unsaved t.save() + t['depends'] = set([dependency]) - self.assertRaises(Task.NotSaved, - t.__setitem__, 'depends', set([dependency])) + self.assertRaises(Task.NotSaved, t.save) def test_set_simple_dependency_set(self): # Adds only one dependency to task with no dependencies @@ -223,7 +223,7 @@ class TaskTest(TasklibTest): t['depends'] = set([dependency1, dependency2]) t.save() - t['depends'] = t['depends'] - set([dependency2]) + t['depends'].remove(dependency2) t.save() self.assertEqual(t['depends'], set([dependency1])) @@ -240,11 +240,23 @@ class TaskTest(TasklibTest): t['depends'] = set([dependency1]) t.save() - t['depends'] = t['depends'] | set([dependency2]) + t['depends'].add(dependency2) t.save() self.assertEqual(t['depends'], set([dependency1, dependency2])) + def test_add_to_empty_dependency_set(self): + # Adds dependency to task with one dependencies + t = Task(self.tw, description="test task") + dependency = Task(self.tw, description="needs to be done first") + + dependency.save() + + t['depends'].add(dependency) + t.save() + + self.assertEqual(t['depends'], set([dependency])) + def test_simple_dependency_set_save_repeatedly(self): # Adds only one dependency to task with no dependencies t = Task(self.tw, description="test task") @@ -413,6 +425,25 @@ class TaskTest(TasklibTest): self.assertRaises(RuntimeError, lambda: t.__setitem__(readonly_key, 'value')) + def test_saving_unmodified_task(self): + t = Task(self.tw, description="test task") + t.save() + t.save() + + def test_adding_tag_by_appending(self): + t = Task(self.tw, description="test task", tags=['test1']) + t.save() + t['tags'].append('test2') + t.save() + self.assertEqual(t['tags'], ['test1', 'test2']) + + def test_adding_tag_by_appending_empty(self): + t = Task(self.tw, description="test task") + t.save() + t['tags'].append('test') + t.save() + self.assertEqual(t['tags'], ['test']) + class AnnotationTest(TasklibTest): @@ -447,6 +478,14 @@ class AnnotationTest(TasklibTest): task.remove_annotation(ann) self.assertEqual(len(task['annotations']), 0) + def test_annotation_after_modification(self): + task = self.tw.tasks.get() + task['project'] = 'test' + task.add_annotation('I should really do this task') + self.assertEqual(task['project'], 'test') + task.save() + self.assertEqual(task['project'], 'test') + class UnicodeTest(TasklibTest):