X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/1e5e9742f8e090bcd7a60276c79aaf5c60db1d0e..ddaa580dc2b2051c80bb6bd1de9c999c46f9ee12:/tasklib/task.py

diff --git a/tasklib/task.py b/tasklib/task.py
index fc56a89..6de828f 100644
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -207,7 +207,7 @@ class Task(TaskResource):
         pass
 
     @classmethod
-    def from_input(cls, input_file=sys.stdin, 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
@@ -226,6 +226,10 @@ class Task(TaskResource):
         # 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
         task._load_data(json.loads(input_file.readline().strip()))
 
@@ -276,7 +280,15 @@ class Task(TaskResource):
     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
@@ -467,8 +479,13 @@ class Task(TaskResource):
         """
 
         # We need to remove spaces for TW-1504, use custom separators
-        data = dict((key, self._serialize(key, value))
-                    for key, value in six.iteritems(self._data))
+        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):