From 38ec8d045e14a40d6de7b6e5b07be0f856591ee2 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Fri, 20 Feb 2015 14:11:32 +0100 Subject: [PATCH] Task: Autmoatically detect TaskWarrior instance in from_input --- tasklib/task.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tasklib/task.py b/tasklib/task.py index 4547400..50384bf 100644 --- a/tasklib/task.py +++ b/tasklib/task.py @@ -385,7 +385,7 @@ class Task(TaskResource): pass @classmethod - def from_input(cls, input_file=sys.stdin, modify=None): + def from_input(cls, input_file=sys.stdin, modify=None, warrior=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 @@ -401,13 +401,18 @@ class Task(TaskResource): but defaults to sys.stdin. """ - # 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 + # Create the TaskWarrior instance if none passed + if warrior is None: + hook_parent_dir = os.path.dirname(os.path.dirname(sys.argv[0])) + warrior = TaskWarrior(data_location=hook_parent_dir) + + # TaskWarrior instance is set to None + task = cls(warrior) + # Load the data from the input task._load_data(json.loads(input_file.readline().strip())) -- 2.39.5