Merge branch 'release/0.8.0' into develop

[etc/taskwarrior.git] / tasklib / task.py

diff --git a/tasklib/task.py b/tasklib/task.py
index 0a74f6c9ecaf4b21027943b507a4e5c9db06867e..9b3626dec070cd741b194900da813f6ae9e84db9 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -29,6 +29,18 @@ class SerializingObject(object):
     """
     Common ancestor for TaskResource & TaskFilter, since they both
     need to serialize arguments.
     """
     Common ancestor for TaskResource & TaskFilter, since they both
     need to serialize arguments.

+
+    Serializing method should hold the following contract:
+      - any empty value (meaning removal of the attribute)
+        is deserialized into a empty string
+      - None denotes a empty value for any attribute
+
+    Deserializing method should hold the following contract:
+      - None denotes a empty value for any attribute (however,
+        this is here as a safeguard, TaskWarrior currently does
+        not export empty-valued attributes) if the attribute
+        is not iterable (e.g. list or set), in which case
+        a empty iterable should be used.

     """
 
     def _deserialize(self, key, value):
     """
 
     def _deserialize(self, key, value):


@@ -43,7 +55,7 @@ class SerializingObject(object):
 
     def timestamp_serializer(self, date):
         if not date:
 
     def timestamp_serializer(self, date):
         if not date:

-            return None
+            return ''

         return date.strftime(DATE_FORMAT)
 
     def timestamp_deserializer(self, date_str):
         return date.strftime(DATE_FORMAT)
 
     def timestamp_deserializer(self, date_str):


@@ -98,9 +110,10 @@ class SerializingObject(object):
             return tags.split(',') if tags else []
         return tags or []
 
             return tags.split(',') if tags else []
         return tags or []
 

-    def serialize_depends(self, cur_dependencies):
+    def serialize_depends(self, value):

         # Return the list of uuids
         # Return the list of uuids

-        return ','.join(task['uuid'] for task in cur_dependencies)
+        value = value if value is not None else set()
+        return ','.join(task['uuid'] for task in value)

 
     def deserialize_depends(self, raw_uuids):
         raw_uuids = raw_uuids or ''  # Convert None to empty string
 
     def deserialize_depends(self, raw_uuids):
         raw_uuids = raw_uuids or ''  # Convert None to empty string


@@ -207,7 +220,7 @@ class Task(TaskResource):
         pass
 
     @classmethod
         pass
 
     @classmethod

-    def from_input(cls, modify=False):
+    def from_input(cls, input_file=sys.stdin, modify=None):

         """
         Creates a Task object, directly from the stdin, by reading one line.
         If modify=True, two lines are used, first line interpreted as the
         """
         Creates a Task object, directly from the stdin, by reading one line.
         If modify=True, two lines are used, first line interpreted as the


@@ -218,18 +231,25 @@ class Task(TaskResource):
         Object created by this method should not be saved, deleted
         or refreshed, as t could create a infinite loop. For this
         reason, TaskWarrior instance is set to None.
         Object created by this method should not be saved, deleted
         or refreshed, as t could create a infinite loop. For this
         reason, TaskWarrior instance is set to None.

+
+        Input_file argument can be used to specify the input file,
+        but defaults to sys.stdin.

         """
 
         # TaskWarrior instance is set to None
         task = cls(None)
 
         """
 
         # TaskWarrior instance is set to None
         task = cls(None)
 

+        # Detect the hook type if not given directly
+        name = os.path.basename(sys.argv[0])
+        modify = name.startswith('on-modify') if modify is None else modify
+

         # Load the data from the input
         # Load the data from the input

-        task._load_data(json.loads(sys.stdin.readline().strip()))
+        task._load_data(json.loads(input_file.readline().strip()))

 
         # If this is a on-modify event, we are provided with additional
         # line of input, which provides updated data
         if modify:
 
         # If this is a on-modify event, we are provided with additional
         # line of input, which provides updated data
         if modify:

-            task._update_data(json.loads(sys.stdin.readline().strip()))
+            task._update_data(json.loads(input_file.readline().strip()))

 
         return task
 
 
         return task
 


@@ -273,11 +293,19 @@ class Task(TaskResource):
     def _modified_fields(self):
         writable_fields = set(self._data.keys()) - set(self.read_only_fields)
         for key in writable_fields:
     def _modified_fields(self):
         writable_fields = set(self._data.keys()) - set(self.read_only_fields)
         for key in writable_fields:

-            if self._data.get(key) != self._original_data.get(key):
+            new_value = self._data.get(key)
+            old_value = self._original_data.get(key)
+
+            # Make sure not to mark data removal as modified field if the
+            # field originally had some empty value
+            if key in self._data and not new_value and not old_value:
+                continue
+
+            if new_value != old_value:

                 yield key
 
     @property
                 yield key
 
     @property

-    def _is_modified(self):
+    def modified(self):

         return bool(list(self._modified_fields))
 
     @property
         return bool(list(self._modified_fields))
 
     @property


@@ -302,7 +330,7 @@ class Task(TaskResource):
 
     def serialize_depends(self, cur_dependencies):
         # Check that all the tasks are saved
 
     def serialize_depends(self, cur_dependencies):
         # Check that all the tasks are saved

-        for task in cur_dependencies:
+        for task in (cur_dependencies or set()):

             if not task.saved:
                 raise Task.NotSaved('Task \'%s\' needs to be saved before '
                                     'it can be set as dependency.' % task)
             if not task.saved:
                 raise Task.NotSaved('Task \'%s\' needs to be saved before '
                                     'it can be set as dependency.' % task)


@@ -370,7 +398,7 @@ class Task(TaskResource):
         self.refresh(only_fields=['status'])
 
     def save(self):
         self.refresh(only_fields=['status'])
 
     def save(self):

-        if self.saved and not self._is_modified:
+        if self.saved and not self.modified:

             return
 
         args = [self['uuid'], 'modify'] if self.saved else ['add']
             return
 
         args = [self['uuid'], 'modify'] if self.saved else ['add']


@@ -419,13 +447,21 @@ class Task(TaskResource):
         def add_field(field):
             # Add the output of format_field method to args list (defaults to
             # field:value)
         def add_field(field):
             # Add the output of format_field method to args list (defaults to
             # 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 ''
-            )
+            serialized_value = self._serialize(field, self._data[field])
+
+            # Empty values should not be enclosed in quotation marks, see
+            # TW-1510
+            if serialized_value is '':
+                escaped_serialized_value = ''
+            else:
+                escaped_serialized_value = "'{0}'".format(serialized_value)
+
+            format_default = lambda: "{0}:{1}".format(field,
+                                                      escaped_serialized_value)
+

             format_func = getattr(self, 'format_{0}'.format(field),
                                   format_default)
             format_func = getattr(self, 'format_{0}'.format(field),
                                   format_default)

+

             args.append(format_func())
 
         # If we're modifying saved task, simply pass on all modified fields
             args.append(format_func())
 
         # If we're modifying saved task, simply pass on all modified fields


@@ -464,7 +500,14 @@ class Task(TaskResource):
         """
 
         # We need to remove spaces for TW-1504, use custom separators
         """
 
         # We need to remove spaces for TW-1504, use custom separators

-        return json.dumps(self._data, separators=(',',':'))
+        data_tuples = ((key, self._serialize(key, value))
+                       for key, value in six.iteritems(self._data))
+
+        # Empty string denotes empty serialized value, we do not want
+        # to pass that to TaskWarrior.
+        data_tuples = filter(lambda t: t[1] is not '', data_tuples)
+        data = dict(data_tuples)
+        return json.dumps(data, separators=(',',':'))

 
 class TaskFilter(SerializingObject):
     """
 
 class TaskFilter(SerializingObject):
     """