X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/7ae5585db6a239a8466b2b55dc5b2053b03e1d3a..32c376913b4cc616cb7fc4e076f0c2ec690229ba:/tasklib/task.py diff --git a/tasklib/task.py b/tasklib/task.py index 86e98ec..8fe1e1b 100644 --- a/tasklib/task.py +++ b/tasklib/task.py @@ -12,6 +12,11 @@ REPR_OUTPUT_SIZE = 10 PENDING = 'pending' COMPLETED = 'completed' +VERSION_2_1_0 = six.u('2.1.0') +VERSION_2_2_0 = six.u('2.2.0') +VERSION_2_3_0 = six.u('2.3.0') +VERSION_2_4_0 = six.u('2.4.0') + logger = logging.getLogger(__name__) @@ -24,8 +29,19 @@ class TaskResource(object): def _load_data(self, data): self._data = data + # We need to use a copy for original data, so that changes + # are not propagated + self._original_data = data.copy() def __getitem__(self, key): + # This is a workaround to make TaskResource non-iterable + # over simple index-based iteration + try: + int(key) + raise StopIteration + except ValueError: + pass + hydrate_func = getattr(self, 'deserialize_{0}'.format(key), lambda x: x) return hydrate_func(self._data.get(key)) @@ -36,7 +52,6 @@ class TaskResource(object): dehydrate_func = getattr(self, 'serialize_{0}'.format(key), lambda x: x) self._data[key] = dehydrate_func(value) - self._modified_fields.add(key) def __str__(self): s = six.text_type(self.__unicode__()) @@ -102,11 +117,22 @@ class Task(TaskResource): kwargs.update(data) self._load_data(kwargs) - self._modified_fields = set() def __unicode__(self): return self['description'] + def __eq__(self, other): + return self['uuid'] == other['uuid'] + + def __hash__(self): + return self['uuid'].__hash__() + + @property + def _modified_fields(self): + for key in self._data.keys(): + if self._data.get(key) != self._original_data.get(key): + yield key + @property def completed(self): return self['status'] == six.text_type('completed') @@ -135,6 +161,41 @@ class Task(TaskResource): return None return datetime.datetime.strptime(date_str, DATE_FORMAT) + def serialize_depends(self, cur_dependencies): + # Check that all the tasks are saved + for task in cur_dependencies: + if not task.saved: + raise Task.NotSaved('Task \'%s\' needs to be saved before ' + 'it can be set as dependency.' % task) + + # Return the list of uuids + return ','.join(task['uuid'] for task in cur_dependencies) + + def deserialize_depends(self, raw_uuids): + raw_uuids = raw_uuids or '' # Convert None to empty string + uuids = raw_uuids.split(',') + return set(self.warrior.tasks.get(uuid=uuid) for uuid in uuids if uuid) + + def format_depends(self): + # We need to generate added and removed dependencies list, + # since Taskwarrior does not accept redefining dependencies. + + # This cannot be part of serialize_depends, since we need + # to keep a list of all depedencies in the _data dictionary, + # not just currently added/removed ones + + old_dependencies_raw = self._original_data.get('depends','') + old_dependencies = self.deserialize_depends(old_dependencies_raw) + + added = self['depends'] - old_dependencies + removed = old_dependencies - self['depends'] + + # Removed dependencies need to be prefixed with '-' + return ','.join( + [t['uuid'] for t in added] + + ['-' + t['uuid'] for t in removed] + ) + def deserialize_annotations(self, data): return [TaskAnnotation(self, d) for d in data] if data else [] @@ -199,7 +260,6 @@ class Task(TaskResource): # Circumvent the ID storage, since ID is considered read-only self._data['id'] = int(id_lines[0].split(' ')[2].rstrip('.')) - self._modified_fields.clear() self.refresh() def add_annotation(self, annotation): @@ -223,16 +283,26 @@ class Task(TaskResource): def _get_modified_fields_as_args(self): args = [] + def add_field(field): + # Task version older than 2.4.0 ignores first word of the + # task description if description: prefix is used + if self.warrior.version < VERSION_2_4_0 and field == 'description': + args.append(self._data[field]) + elif field == 'depends': + args.append('{0}:{1}'.format(field, self.format_depends())) + else: + args.append('{0}:{1}'.format(field, self._data[field])) + # If we're modifying saved task, simply pass on all modified fields if self.saved: for field in self._modified_fields: - args.append('{0}:{1}'.format(field, self._data[field])) + add_field(field) # For new tasks, pass all fields that make sense else: for field in self._data.keys(): if field in self.read_only_fields: continue - args.append('{0}:{1}'.format(field, self._data[field])) + add_field(field) return args @@ -250,8 +320,13 @@ class Task(TaskResource): to_update = dict( [(k, new_data.get(k)) for k in only_fields]) self._data.update(to_update) + self._original_data.update(to_update) else: self._data = new_data + # We need to create a clone for original_data though + # Shallow copy is alright, since data dict uses only + # primitive data types + self._original_data = new_data.copy() class TaskFilter(object): @@ -271,7 +346,13 @@ class TaskFilter(object): # Replace the value with empty string, since that is the # convention in TW for empty values value = value if value is not None else '' - self.filter_params.append('{0}:{1}'.format(key, value)) + + # If we are filtering by uuid:, do not use uuid keyword + # due to TW-1452 bug + if key == 'uuid': + self.filter_params.insert(0, value) + else: + self.filter_params.append('{0}:{1}'.format(key, value)) def get_filter_params(self): return [f for f in self.filter_params if f] @@ -401,6 +482,7 @@ class TaskWarrior(object): 'data.location': os.path.expanduser(data_location), } self.tasks = TaskQuerySet(self) + self.version = self._get_version() def _get_command_args(self, args, config_override={}): command_args = ['task', 'rc:/'] @@ -411,6 +493,14 @@ class TaskWarrior(object): command_args.extend(map(str, args)) return command_args + def _get_version(self): + p = subprocess.Popen( + ['task', '--version'], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = [x.decode('utf-8') for x in p.communicate()] + return stdout.strip('\n') + def execute_command(self, args, config_override={}): command_args = self._get_command_args( args, config_override=config_override)