X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/8d7a75cc74e0812c6f036317ba64a525cb768bea..1c7620f16af735f074cc9903e15e38260f1faf4e:/tasklib/task.py?ds=inline
diff --git a/tasklib/task.py b/tasklib/task.py
index 72e16af..708c9c7 100644
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -5,6 +5,7 @@ import json
import logging
import os
import pytz
+import re
import six
import sys
import subprocess
@@ -264,7 +265,7 @@ class SerializingObject(object):
# time zone at this point. Also None is a valid value too.
localized = value
elif (isinstance(value, six.string_types)
- and self.warrior.version > VERSION_2_4_0):
+ and self.warrior.version >= VERSION_2_4_0):
# For strings, use 'task calc' to evaluate the string to datetime
# available since TW 2.4.0
args = value.split()
@@ -297,7 +298,7 @@ class TaskResource(SerializingObject):
# are not propagated.
self._original_data = copy.deepcopy(self._data)
- def _update_data(self, data, update_original=False):
+ def _update_data(self, data, update_original=False, remove_missing=False):
"""
Low level update of the internal _data dict. Data which are coming as
updates should already be serialized. If update_original is True, the
@@ -306,6 +307,11 @@ class TaskResource(SerializingObject):
self._data.update(dict((key, self._deserialize(key, value))
for key, value in data.items()))
+ # In certain situations, we want to treat missing keys as removals
+ if remove_missing:
+ for key in set(self._data.keys()) - set(data.keys()):
+ self._data[key] = None
+
if update_original:
self._original_data = copy.deepcopy(self._data)
@@ -416,6 +422,18 @@ class Task(TaskResource):
"""
pass
+ class ActiveTask(Exception):
+ """
+ Raised when the operation cannot be performed on the active task.
+ """
+ pass
+
+ class InactiveTask(Exception):
+ """
+ Raised when the operation cannot be performed on an inactive task.
+ """
+ pass
+
class NotSaved(Exception):
"""
Raised when the operation cannot be performed on the task, because
@@ -458,7 +476,8 @@ class Task(TaskResource):
# 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(input_file.readline().strip()))
+ task._update_data(json.loads(input_file.readline().strip()),
+ remove_missing=True)
return task
@@ -518,6 +537,10 @@ class Task(TaskResource):
def pending(self):
return self['status'] == six.text_type('pending')
+ @property
+ def active(self):
+ return self['start'] is not None
+
@property
def saved(self):
return self['uuid'] is not None or self['id'] is not None
@@ -556,7 +579,7 @@ class Task(TaskResource):
if self.warrior.version < VERSION_2_4_0:
return self._data['description']
else:
- return "description:'{0}'".format(self._data['description'] or '')
+ return six.u("description:'{0}'").format(self._data['description'] or '')
def delete(self):
if not self.saved:
@@ -584,12 +607,29 @@ class Task(TaskResource):
raise Task.CompletedTask("Cannot start a completed task")
elif self.deleted:
raise Task.DeletedTask("Deleted task cannot be started")
+ elif self.active:
+ raise Task.ActiveTask("Task is already active")
self.warrior.execute_command([self['uuid'], 'start'])
# Refresh the status again, so that we have updated info stored
self.refresh(only_fields=['status', 'start'])
+ def stop(self):
+ if not self.saved:
+ raise Task.NotSaved("Task needs to be saved before it can be stopped")
+
+ # Refresh, and raise exception if task is already completed/deleted
+ self.refresh(only_fields=['status'])
+
+ if not self.active:
+ raise Task.InactiveTask("Cannot stop an inactive task")
+
+ self.warrior.execute_command([self['uuid'], 'stop'])
+
+ # Refresh the status again, so that we have updated info stored
+ self.refresh(only_fields=['status', 'start'])
+
def done(self):
if not self.saved:
raise Task.NotSaved("Task needs to be saved before it can be completed")
@@ -602,6 +642,10 @@ class Task(TaskResource):
elif self.deleted:
raise Task.DeletedTask("Deleted task cannot be completed")
+ # Older versions of TW do not stop active task at completion
+ if self.warrior.version < VERSION_2_4_0 and self.active:
+ self.stop()
+
self.warrior.execute_command([self['uuid'], 'done'])
# Refresh the status again, so that we have updated info stored
@@ -664,9 +708,9 @@ class Task(TaskResource):
if serialized_value is '':
escaped_serialized_value = ''
else:
- escaped_serialized_value = "'{0}'".format(serialized_value)
+ escaped_serialized_value = six.u("'{0}'").format(serialized_value)
- format_default = lambda: "{0}:{1}".format(field,
+ format_default = lambda: six.u("{0}:{1}").format(field,
escaped_serialized_value)
format_func = getattr(self, 'format_{0}'.format(field),
@@ -740,7 +784,7 @@ class TaskFilter(SerializingObject):
modifier = '.is' if value else '.none'
key = key + modifier if '.' not in key else key
- self.filter_params.append("{0}:{1}".format(key, value))
+ self.filter_params.append(six.u("{0}:{1}").format(key, value))
def get_filter_params(self):
return [f for f in self.filter_params if f]
@@ -862,8 +906,7 @@ class TaskQuerySet(object):
class TaskWarrior(object):
- def __init__(self, data_location='~/.task', create=True, taskrc_location='~/.taskrc'):
- data_location = os.path.expanduser(data_location)
+ def __init__(self, data_location=None, create=True, taskrc_location='~/.taskrc'):
self.taskrc_location = os.path.expanduser(taskrc_location)
# If taskrc does not exist, pass / to use defaults and avoid creating
@@ -871,19 +914,27 @@ class TaskWarrior(object):
if not os.path.exists(self.taskrc_location):
self.taskrc_location = '/'
- if create and not os.path.exists(data_location):
- os.makedirs(data_location)
-
self.version = self._get_version()
self.config = {
- 'data.location': data_location,
'confirmation': 'no',
'dependency.confirmation': 'no', # See TW-1483 or taskrc man page
'recurrence.confirmation': 'no', # Necessary for modifying R tasks
+
+ # Defaults to on since 2.4.5, we expect off during parsing
+ 'json.array': 'off',
+
# 2.4.3 onwards supports 0 as infite bulk, otherwise set just
# arbitrary big number which is likely to be large enough
- 'bulk': 0 if self.version > VERSION_2_4_3 else 100000,
+ 'bulk': 0 if self.version >= VERSION_2_4_3 else 100000,
}
+
+ # Set data.location override if passed via kwarg
+ if data_location is not None:
+ data_location = os.path.expanduser(data_location)
+ if create and not os.path.exists(data_location):
+ os.makedirs(data_location)
+ self.config['data.location'] = data_location
+
self.tasks = TaskQuerySet(self)
def _get_command_args(self, args, config_override={}):
@@ -892,7 +943,7 @@ class TaskWarrior(object):
config.update(config_override)
for item in config.items():
command_args.append('rc.{0}={1}'.format(*item))
- command_args.extend(map(str, args))
+ command_args.extend(map(six.text_type, args))
return command_args
def _get_version(self):
@@ -903,7 +954,24 @@ class TaskWarrior(object):
stdout, stderr = [x.decode('utf-8') for x in p.communicate()]
return stdout.strip('\n')
- def execute_command(self, args, config_override={}, allow_failure=True):
+ def get_config(self):
+ raw_output = self.execute_command(
+ ['show'],
+ config_override={'verbose': 'nothing'}
+ )
+
+ config = dict()
+ config_regex = re.compile(r'^(?P<key>[^\s]+)\s+(?P<value>[^\s].+$)')
+
+ for line in raw_output:
+ match = config_regex.match(line)
+ if match:
+ config[match.group('key')] = match.group('value').strip()
+
+ return config
+
+ def execute_command(self, args, config_override={}, allow_failure=True,
+ return_all=False):
command_args = self._get_command_args(
args, config_override=config_override)
logger.debug(' '.join(command_args))
@@ -916,7 +984,14 @@ class TaskWarrior(object):
else:
error_msg = stdout.strip()
raise TaskWarriorException(error_msg)
- return stdout.rstrip().split('\n')
+
+ # Return all whole triplet only if explicitly asked for
+ if not return_all:
+ return stdout.rstrip().split('\n')
+ else:
+ return (stdout.rstrip().split('\n'),
+ stderr.rstrip().split('\n'),
+ p.returncode)
def enforce_recurrence(self):
# Run arbitrary report command which will trigger generation