]> 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 saving logic into the backend
authorTomas Babej <tomasbabej@gmail.com>
Sat, 8 Aug 2015 17:40:48 +0000 (19:40 +0200)
committerTomas Babej <tomasbabej@gmail.com>
Sat, 8 Aug 2015 17:40:48 +0000 (19:40 +0200)
tasklib/backends.py
tasklib/task.py

index f817d4f31d1cef32987cdaae2074aa8664960b63..a4d074e508aa4f25db367cf2e3df6e942375c159 100644 (file)
@@ -159,6 +159,37 @@ class TaskWarrior(object):
                     raise TaskWarriorException('Invalid JSON: %s' % data)
         return tasks
 
                     raise TaskWarriorException('Invalid JSON: %s' % data)
         return tasks
 
+    def save_task(self, task):
+        """Save a task into TaskWarrior database using add/modify call"""
+
+        args = [task['uuid'], 'modify'] if task.saved else ['add']
+        args.extend(task._get_modified_fields_as_args())
+        output = self.execute_command(args)
+
+        # Parse out the new ID, if the task is being added for the first time
+        if not task.saved:
+            id_lines = [l for l in output if l.startswith('Created task ')]
+
+            # Complain loudly if it seems that more tasks were created
+            # Should not happen
+            if len(id_lines) != 1 or len(id_lines[0].split(' ')) != 3:
+                raise TaskWarriorException("Unexpected output when creating "
+                                           "task: %s" % '\n'.join(id_lines))
+
+            # Circumvent the ID storage, since ID is considered read-only
+            identifier = id_lines[0].split(' ')[2].rstrip('.')
+
+            # Identifier can be either ID or UUID for completed tasks
+            try:
+                task._data['id'] = int(identifier)
+            except ValueError:
+                task._data['uuid'] = identifier
+
+        # Refreshing is very important here, as not only modification time
+        # is updated, but arbitrary attribute may have changed due hooks
+        # altering the data before saving
+        task.refresh(after_save=True)
+
     def merge_with(self, path, push=False):
         path = path.rstrip('/') + '/'
         self.execute_command(['merge', path], config_override={
     def merge_with(self, path, push=False):
         path = path.rstrip('/') + '/'
         self.execute_command(['merge', path], config_override={
index 4f10b9dc358f21c2cb9d671f3bae5706aceb57a2..7c6dff83d065976a9b47bb6dcae860b306250fd6 100644 (file)
@@ -650,33 +650,8 @@ class Task(TaskResource):
         if self.saved and not self.modified:
             return
 
         if self.saved and not self.modified:
             return
 
-        args = [self['uuid'], 'modify'] if self.saved else ['add']
-        args.extend(self._get_modified_fields_as_args())
-        output = self.warrior.execute_command(args)
-
-        # Parse out the new ID, if the task is being added for the first time
-        if not self.saved:
-            id_lines = [l for l in output if l.startswith('Created task ')]
-
-            # Complain loudly if it seems that more tasks were created
-            # Should not happen
-            if len(id_lines) != 1 or len(id_lines[0].split(' ')) != 3:
-                raise TaskWarriorException("Unexpected output when creating "
-                                           "task: %s" % '\n'.join(id_lines))
-
-            # Circumvent the ID storage, since ID is considered read-only
-            identifier = id_lines[0].split(' ')[2].rstrip('.')
-
-            # Identifier can be either ID or UUID for completed tasks
-            try:
-                self._data['id'] = int(identifier)
-            except ValueError:
-                self._data['uuid'] = identifier
-
-        # Refreshing is very important here, as not only modification time
-        # is updated, but arbitrary attribute may have changed due hooks
-        # altering the data before saving
-        self.refresh(after_save=True)
+        # All the actual work is done by the backend
+        self.backend.save_task(self)
 
     def add_annotation(self, annotation):
         if not self.saved:
 
     def add_annotation(self, annotation):
         if not self.saved: