Task: Provide automatic hook type detection

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

diff --git a/tasklib/task.py b/tasklib/task.py
index f21ea43110fab8488a21bcb134f03d603cb993dc..040c15bd274e06353b1b380894ee9ad0e4154c90 100644 (file)
--- 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()))
 
@@ -280,7 +284,7 @@ class Task(TaskResource):
                 yield key
 
     @property
-    def _is_modified(self):
+    def modified(self):
         return bool(list(self._modified_fields))
 
     @property
@@ -373,7 +377,7 @@ class Task(TaskResource):
         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']
@@ -467,7 +471,9 @@ class Task(TaskResource):
         """
 
         # We need to remove spaces for TW-1504, use custom separators
-        return json.dumps(self._data, separators=(',',':'))
+        data = dict((key, self._serialize(key, value))
+                    for key, value in six.iteritems(self._data))
+        return json.dumps(data, separators=(',',':'))
 
 class TaskFilter(SerializingObject):
     """