Task: Move TW-specific completion logic into TW backend

[etc/taskwarrior.git] / tasklib / task.py

diff --git a/tasklib/task.py b/tasklib/task.py
index 7c6dff83d065976a9b47bb6dcae860b306250fd6..3f53511416da4ec670689ecb34f3f4cfc0e646a4 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -586,7 +586,7 @@ class Task(TaskResource):
         if self.deleted:
             raise Task.DeletedTask("Task was already deleted")
 
         if self.deleted:
             raise Task.DeletedTask("Task was already deleted")
 

-        self.warrior.execute_command([self['uuid'], 'delete'])
+        self.backend.delete_task(self)

 
         # Refresh the status again, so that we have updated info stored
         self.refresh(only_fields=['status', 'start', 'end'])
 
         # Refresh the status again, so that we have updated info stored
         self.refresh(only_fields=['status', 'start', 'end'])


@@ -605,7 +605,7 @@ class Task(TaskResource):
         elif self.active:
             raise Task.ActiveTask("Task is already active")
 
         elif self.active:
             raise Task.ActiveTask("Task is already active")
 

-        self.warrior.execute_command([self['uuid'], 'start'])
+        self.backend.start_task(self)

 
         # Refresh the status again, so that we have updated info stored
         self.refresh(only_fields=['status', 'start'])
 
         # Refresh the status again, so that we have updated info stored
         self.refresh(only_fields=['status', 'start'])


@@ -620,7 +620,7 @@ class Task(TaskResource):
         if not self.active:
             raise Task.InactiveTask("Cannot stop an inactive task")
 
         if not self.active:
             raise Task.InactiveTask("Cannot stop an inactive task")
 

-        self.warrior.execute_command([self['uuid'], 'stop'])
+        self.backend.stop_task(self)

 
         # Refresh the status again, so that we have updated info stored
         self.refresh(only_fields=['status', 'start'])
 
         # Refresh the status again, so that we have updated info stored
         self.refresh(only_fields=['status', 'start'])


@@ -637,11 +637,7 @@ class Task(TaskResource):
         elif self.deleted:
             raise Task.DeletedTask("Deleted task cannot be completed")
 
         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'])
+        self.backend.complete_task(self)

 
         # Refresh the status again, so that we have updated info stored
         self.refresh(only_fields=['status', 'start', 'end'])
 
         # Refresh the status again, so that we have updated info stored
         self.refresh(only_fields=['status', 'start', 'end'])