X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/b7186a04cfecae9de25444ac9137f01f11d64db9..a0df8b516ffc77612d4ef8193f2bd5dd696916fa:/tasklib/task.py?ds=sidebyside

diff --git a/tasklib/task.py b/tasklib/task.py
index ec3de29..0b18a14 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()))
 
@@ -467,7 +471,14 @@ class Task(TaskResource):
         """
 
         # 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):
     """