Migrate commands operating on multiple todo IDs to MultiCommand

topydo/lib/DCommand.py

@@ -16,12 +16,12 @@
 
 import re
 
-from topydo.lib.Command import Command
+from topydo.lib.MultiCommand import MultiCommand
 from topydo.lib.PrettyPrinter import PrettyPrinter
 from topydo.lib.PrettyPrinterFilter import PrettyPrinterNumbers
 from topydo.lib.TodoListBase import InvalidTodoException
 
-class DCommand(Command):
+class DCommand(MultiCommand):
     """
     A common class for the 'do' and 'del' operations, because they're quite
     alike.
@@ -38,14 +38,7 @@ class DCommand(Command):
 
         self.process_flags()
         self.length = len(self.todolist.todos()) # to determine newly activated todos
-
-        self.todos = []
-        self.invalid_numbers = []
-        for number in self.args:
-            try:
-                self.todos.append(self.todolist.todo(number))
-            except InvalidTodoException:
-                self.invalid_numbers.append(number)
+        self.get_todos(self.args)
 
     def get_flags(self):
         """ Default implementation of getting specific flags. """
@@ -140,14 +133,9 @@ class DCommand(Command):
         if not super(DCommand, self).execute():
             return False
 
-        if len(self.args) == 0:
-            self.error(self.usage())
-        elif len(self.invalid_numbers) > 1 or len(self.invalid_numbers) > 0 and len(self.todos) > 0:
-            for number in self.invalid_numbers:
-                self.error("Invalid todo number given: {}.".format(number))
-        elif len(self.invalid_numbers) == 1 and len(self.todos) == 0:
-            self.error("Invalid todo number given.")
-        else:
+        todo_errors = self.catch_todo_errors()
+
+        if not todo_errors:
             old_active = self._active_todos()
 
             for todo in self.todos:
@@ -159,4 +147,6 @@ class DCommand(Command):
 
             current_active = self._active_todos()
             self._print_unlocked_todos(old_active, current_active)
-
+        else:
+            for error in todo_errors:
+                self.error(error)

topydo/lib/PostponeCommand.py

@@ -16,14 +16,15 @@
 
 from datetime import date, timedelta
 
-from topydo.lib.Command import Command, InvalidCommandArgument
+from topydo.lib.MultiCommand import MultiCommand
+from topydo.lib.Command import InvalidCommandArgument
 from topydo.lib.Config import config
 from topydo.lib.PrettyPrinterFilter import PrettyPrinterNumbers
 from topydo.lib.RelativeDate import relative_date_to_date
 from topydo.lib.TodoListBase import InvalidTodoException
 from topydo.lib.Utils import date_string_to_date
 
-class PostponeCommand(Command):
+class PostponeCommand(MultiCommand):
     def __init__(self, p_args, p_todolist,
                  p_out=lambda a: None,
                  p_err=lambda a: None,
@@ -32,6 +33,8 @@ class PostponeCommand(Command):
             p_args, p_todolist, p_out, p_err, p_prompt)
 
         self.move_start_date = False
+        self._process_flags()
+        self.get_todos(self.args[:-1])
 
     def _process_flags(self):
         opts, args = self.getopt('s')
@@ -56,29 +59,14 @@ class PostponeCommand(Command):
         if not super(PostponeCommand, self).execute():
             return False
 
-        self._process_flags()
-
-        todos = []
-        invalid_numbers = []
+        todo_errors = self.catch_todo_errors()
 
-        for number in self.args[:-1]:
-            try:
-                todos.append(self.todolist.todo(number))
-            except InvalidTodoException:
-                invalid_numbers.append(number)
-
-        if len(invalid_numbers) > 1 or len(invalid_numbers) > 0 and len(todos) > 0:
-            for number in invalid_numbers:
-                self.error("Invalid todo number given: {}.".format(number))
-        elif len(invalid_numbers) == 1 and len(todos) == 0:
-            self.error("Invalid todo number given.")
-        else:
+        if not todo_errors:
             try:
                 pattern = self.args[-1]
                 self.printer.add_filter(PrettyPrinterNumbers(self.todolist))
 
-                if len(todos) > 0:
-                    for todo in todos:
+                for todo in self.todos:
                     offset = _get_offset(todo)
                     new_due = relative_date_to_date(pattern, offset)
 
@@ -95,11 +83,11 @@ class PostponeCommand(Command):
                     else:
                         self.error("Invalid date pattern given.")
                         break
-                else:
-                    self.error(self.usage())
-
             except (InvalidCommandArgument, IndexError):
                 self.error(self.usage())
+        else:
+            for error in todo_errors:
+                self.error(error)
 
     def usage(self):
         return "Synopsis: postpone [-s] <NUMBER> [<NUMBER2> ...] <PATTERN>"

topydo/lib/PriorityCommand.py

@@ -14,12 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from topydo.lib.Command import Command
+from topydo.lib.MultiCommand import MultiCommand
 from topydo.lib.PrettyPrinterFilter import PrettyPrinterNumbers
 from topydo.lib.TodoListBase import InvalidTodoException
 from topydo.lib.Utils import is_valid_priority
 
-class PriorityCommand(Command):
+class PriorityCommand(MultiCommand):
     def __init__(self, p_args, p_todolist,
                  p_out=lambda a: None,
                  p_err=lambda a: None,
@@ -27,33 +27,22 @@ class PriorityCommand(Command):
         super(PriorityCommand, self).__init__(
             p_args, p_todolist, p_out, p_err, p_prompt)
 
+        self.get_todos(self.args[:-1])
+
     def execute(self):
         if not super(PriorityCommand, self).execute():
             return False
 
         priority = None
-        todos = []
-        invalid_numbers = []
-
-        for number in self.args[:-1]:
-            try:
-                todos.append(self.todolist.todo(number))
-            except InvalidTodoException:
-                invalid_numbers.append(number)
+        todo_errors = self.catch_todo_errors()
 
-        if len(invalid_numbers) > 1 or len(invalid_numbers) > 0 and len(todos) > 0:
-            for number in invalid_numbers:
-                self.error("Invalid todo number given: {}.".format(number))
-        elif len(invalid_numbers) == 1 and len(todos) == 0:
-            self.error("Invalid todo number given.")
-        else:
+        if not todo_errors:
             try:
                 priority = self.args[-1]
                 self.printer.add_filter(PrettyPrinterNumbers(self.todolist))
 
-                if len(todos) > 0:
                 if is_valid_priority(priority):
-                        for todo in todos:
+                    for todo in self.todos:
                         old_priority = todo.priority()
                         self.todolist.set_priority(todo, priority)
 
@@ -66,10 +55,11 @@ class PriorityCommand(Command):
                         self.out(self.printer.print_todo(todo))
                 else:
                     self.error("Invalid priority given.")
-                else:
-                    self.error(self.usage())
             except IndexError:
                 self.error(self.usage())
+        else:
+            for error in todo_errors:
+                self.error(error)
 
     def usage(self):
         return """Synopsis: pri <NUMBER1> [<NUMBER2> ...] <PRIORITY>"""