]> git.madduck.net Git - etc/taskwarrior.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Task: Move TW-specific refresh behaviour to TW backend
authorTomas Babej <tomasbabej@gmail.com>
Sat, 8 Aug 2015 18:44:01 +0000 (20:44 +0200)
committerTomas Babej <tomasbabej@gmail.com>
Sat, 8 Aug 2015 18:49:18 +0000 (20:49 +0200)
tasklib/backends.py
tasklib/task.py

index bf4cd67cd75e69cf2a3200f500636c84f2d78323..92102cbb70f17efe471f818c99acb8e459d4336c 100644 (file)
@@ -1,4 +1,5 @@
 import abc
 import abc
+import json
 import os
 import re
 import subprocess
 import os
 import re
 import subprocess
@@ -43,7 +44,7 @@ class Backend(object):
         pass
 
     @abc.abstractmethod
         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.
         """
         Refreshes the given task. Returns new data dict with serialized
         attributes.
@@ -229,3 +230,42 @@ class TaskWarrior(object):
 
         self.execute_command([task['uuid'], 'done'])
 
 
         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])
+
index 3f53511416da4ec670689ecb34f3f4cfc0e646a4..5a865293302ff15eb84b1ddf52b48fc8ff56b95a 100644 (file)
@@ -708,43 +708,8 @@ class Task(TaskResource):
         if not self.saved:
             raise Task.NotSaved("Task needs to be saved to be refreshed")
 
         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])
         if only_fields:
             to_update = dict(
                 [(k, new_data.get(k)) for k in only_fields])