]> 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: Perform done and deleted operations only when necessary
authorTomas Babej <tomasbabej@gmail.com>
Fri, 19 Dec 2014 01:17:43 +0000 (02:17 +0100)
committerTomas Babej <tomasbabej@gmail.com>
Thu, 25 Dec 2014 22:51:11 +0000 (23:51 +0100)
tasklib/task.py

index 491a3746b33d326e7b40c49a67ce472921dd47aa..c72a9b307ec9769d73081d92b4ae221c07a5a881 100644 (file)
@@ -76,6 +76,18 @@ class Task(TaskResource):
     class DoesNotExist(Exception):
         pass
 
     class DoesNotExist(Exception):
         pass
 
+    class CompletedTask(Exception):
+        """
+        Raised when the operation cannot be performed on the completed task.
+        """
+        pass
+
+    class DeletedTask(Exception):
+        """
+        Raised when the operation cannot be performed on the deleted task.
+        """
+        pass
+
     def __init__(self, warrior, data={}):
         self.warrior = warrior
         self._load_data(data)
     def __init__(self, warrior, data={}):
         self.warrior = warrior
         self._load_data(data)
@@ -84,6 +96,22 @@ class Task(TaskResource):
     def __unicode__(self):
         return self['description']
 
     def __unicode__(self):
         return self['description']
 
+    @property
+    def completed(self):
+        return self['status'] == six.text_type('completed')
+
+    @property
+    def deleted(self):
+        return self['status'] == six.text_type('deleted')
+
+    @property
+    def waiting(self):
+        return self['status'] == six.text_type('waiting')
+
+    @property
+    def pending(self):
+        return self['status'] == six.text_type('pending')
+
     def serialize_due(self, date):
         return date.strftime(DATE_FORMAT)
 
     def serialize_due(self, date):
         return date.strftime(DATE_FORMAT)
 
@@ -104,13 +132,34 @@ class Task(TaskResource):
         return ','.join(tags) if tags else ''
 
     def delete(self):
         return ','.join(tags) if tags else ''
 
     def delete(self):
+        # Refresh the status, and raise exception if the task is deleted
+        self.refresh(only_fields=['status'])
+
+        if self.deleted:
+            raise self.DeletedTask("Task was already deleted")
+
         self.warrior.execute_command([self['id'], 'delete'], config_override={
             'confirmation': 'no',
         })
 
         self.warrior.execute_command([self['id'], 'delete'], config_override={
             'confirmation': 'no',
         })
 
+        # Refresh the status again, so that we have updated info stored
+        self.refresh(only_fields=['status'])
+
+
     def done(self):
     def done(self):
+        # Refresh, and raise exception if task is already completed/deleted
+        self.refresh(only_fields=['status'])
+
+        if self.completed:
+            raise self.CompletedTask("Cannot complete a completed task")
+        elif self.deleted:
+            raise self.DeletedTask("Deleted task cannot be completed")
+
         self.warrior.execute_command([self['id'], 'done'])
 
         self.warrior.execute_command([self['id'], 'done'])
 
+        # Refresh the status again, so that we have updated info stored
+        self.refresh(only_fields=['status'])
+
     def save(self):
         args = [self['id'], 'modify'] if self['id'] else ['add']
         args.extend(self._get_modified_fields_as_args())
     def save(self):
         args = [self['id'], 'modify'] if self['id'] else ['add']
         args.extend(self._get_modified_fields_as_args())