From 398bbf824e6143cf760002af3065897011e469f0 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Sat, 8 Aug 2015 20:44:01 +0200 Subject: [PATCH] Task: Move TW-specific refresh behaviour to TW backend --- tasklib/backends.py | 42 +++++++++++++++++++++++++++++++++++++++++- tasklib/task.py | 37 +------------------------------------ 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/tasklib/backends.py b/tasklib/backends.py index bf4cd67..92102cb 100644 --- a/tasklib/backends.py +++ b/tasklib/backends.py @@ -1,4 +1,5 @@ import abc +import json import os import re import subprocess @@ -43,7 +44,7 @@ class Backend(object): pass @abc.abstractmethod - def refresh_task(self, task): + def refresh_task(self, task, after_save=False): """ Refreshes the given task. Returns new data dict with serialized attributes. @@ -229,3 +230,42 @@ class TaskWarrior(object): self.execute_command([task['uuid'], 'done']) + def refresh_task(self, task, after_save=False): + # We need to use ID as backup for uuid here for the refreshes + # of newly saved tasks. Any other place in the code is fine + # with using UUID only. + args = [task['uuid'] or task['id'], 'export'] + output = self.execute_command(args) + + def valid(output): + return len(output) == 1 and output[0].startswith('{') + + # For older TW versions attempt to uniquely locate the task + # using the data we have if it has been just saved. + # This can happen when adding a completed task on older TW versions. + if (not valid(output) and self.version < VERSION_2_4_5 + and after_save): + + # Make a copy, removing ID and UUID. It's most likely invalid + # (ID 0) if it failed to match a unique task. + data = copy.deepcopy(task._data) + data.pop('id', None) + data.pop('uuid', None) + + taskfilter = TaskFilter(self) + for key, value in data.items(): + taskfilter.add_filter_param(key, value) + + output = self.execute_command(['export', '--'] + + taskfilter.get_filter_params()) + + # If more than 1 task has been matched still, raise an exception + if not valid(output): + raise TaskWarriorException( + "Unique identifiers {0} with description: {1} matches " + "multiple tasks: {2}".format( + task['uuid'] or task['id'], task['description'], output) + ) + + return json.loads(output[0]) + diff --git a/tasklib/task.py b/tasklib/task.py index 3f53511..5a86529 100644 --- a/tasklib/task.py +++ b/tasklib/task.py @@ -708,43 +708,8 @@ class Task(TaskResource): if not self.saved: raise Task.NotSaved("Task needs to be saved to be refreshed") - # We need to use ID as backup for uuid here for the refreshes - # of newly saved tasks. Any other place in the code is fine - # with using UUID only. - args = [self['uuid'] or self['id'], 'export'] - output = self.warrior.execute_command(args) - - def valid(output): - return len(output) == 1 and output[0].startswith('{') - - # For older TW versions attempt to uniquely locate the task - # using the data we have if it has been just saved. - # This can happen when adding a completed task on older TW versions. - if (not valid(output) and self.warrior.version < VERSION_2_4_5 - and after_save): - - # Make a copy, removing ID and UUID. It's most likely invalid - # (ID 0) if it failed to match a unique task. - data = copy.deepcopy(self._data) - data.pop('id', None) - data.pop('uuid', None) - - taskfilter = TaskFilter(self.warrior) - for key, value in data.items(): - taskfilter.add_filter_param(key, value) - - output = self.warrior.execute_command(['export', '--'] + - taskfilter.get_filter_params()) - - # If more than 1 task has been matched still, raise an exception - if not valid(output): - raise TaskWarriorException( - "Unique identifiers {0} with description: {1} matches " - "multiple tasks: {2}".format( - self['uuid'] or self['id'], self['description'], output) - ) + new_data = self.backend.refresh_task(self, after_save=after_save) - new_data = json.loads(output[0]) if only_fields: to_update = dict( [(k, new_data.get(k)) for k in only_fields]) -- 2.39.5