commands/globals: wrap apply in an error handler

As we split the apply method up into separate methods we need a way for
those helpers to stop execution of the method. This wraps the real apply
method inside of a try/except block with a custom exception. Any helper
that is intended to run in the apply method simply needs to raise this
exception, and apply will return.

1 files changed, 9 insertions, 0 deletions

diff --git a/alot/commands/globals.py b/alot/commands/globals.py
index cd2e9512..391f0913 100644
--- a/alot/commands/globals.py
+++ b/alot/commands/globals.py
@@ -779,7 +779,16 @@ class ComposeCommand(Command):
         self.encrypt = encrypt
         self.tags = tags
 
+    class ApplyError(Exception):
+        pass
+
     async def apply(self, ui):
+        try:
+            await self.__apply(ui)
+        except self.ApplyError:
+            return
+
+    async def __apply(self, ui):
         if self.envelope is None:
             if self.rest:
                 if self.rest.startswith('mailto'):