From bd34e0fe5310941f7288bb6062d22eb579205a09 Mon Sep 17 00:00:00 2001
From: Patrick Totzke <patricktotzke@gmail.com>
Date: Mon, 24 Jun 2013 14:06:56 +0100
Subject: handle CompletionErrors

this makes the CompleteEdit widget handle errors
raised during completions by passing them on to
a 'on_error' callback given to its constructor.

This is then used in UI.prompt.
---
 alot/ui.py              |  9 ++++++++-
 alot/widgets/globals.py | 20 ++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/alot/ui.py b/alot/ui.py
index 93379dad..c7dbb269 100644
--- a/alot/ui.py
+++ b/alot/ui.py
@@ -222,12 +222,19 @@ class UI(object):
             self._passall = False
             d.callback(text)
 
+        def cerror(e):
+            logging.error(e)
+            self.notify('completion error: %s' % e.message,
+                        priority='error')
+            self.update()
+
         prefix = prefix + settings.get('prompt_suffix')
 
         # set up widgets
         leftpart = urwid.Text(prefix, align='left')
         editpart = CompleteEdit(completer, on_exit=select_or_cancel,
-                                edit_text=text, history=history)
+                                edit_text=text, history=history,
+                                on_error=cerror)
 
         for i in range(tab):  # hit some tabs
             editpart.keypress((0,), 'tab')
diff --git a/alot/widgets/globals.py b/alot/widgets/globals.py
index d9e7fadb..785285af 100644
--- a/alot/widgets/globals.py
+++ b/alot/widgets/globals.py
@@ -10,6 +10,7 @@ import urwid
 from alot.helper import string_decode
 from alot.settings import settings
 from alot.db.attachment import Attachment
+from alot.errors import CompletionError
 
 
 class AttachmentWidget(urwid.WidgetWrap):
@@ -71,10 +72,11 @@ class ChoiceWidget(urwid.Text):
 
 
 class CompleteEdit(urwid.Edit):
-    def __init__(self, completer, on_exit, edit_text=u'',
-                 history=None, **kwargs):
+    def __init__(self, completer, on_exit, edit_text=u'', history=None,
+                 on_error=None, **kwargs):
         self.completer = completer
         self.on_exit = on_exit
+        self.on_error = on_error
         self.history = list(history)  # we temporarily add stuff here
         self.historypos = None
 
@@ -88,10 +90,16 @@ class CompleteEdit(urwid.Edit):
         # if we tabcomplete
         if key in ['tab', 'shift tab'] and self.completer:
             # if not already in completion mode
-            if not self.completions:
-                self.completions = [(self.edit_text, self.edit_pos)] + \
-                    self.completer.complete(self.edit_text, self.edit_pos)
-                self.focus_in_clist = 1
+            if self.completions is None:
+                self.completions = [(self.edit_text, self.edit_pos)]
+                try:
+                    self.completions += self.completer.complete(self.edit_text,
+                                                                self.edit_pos)
+                    self.focus_in_clist = 1
+                except CompletionError, e:
+                    if self.on_error is not None:
+                        self.on_error(e)
+
             else:  # otherwise tab through results
                 if key == 'tab':
                     self.focus_in_clist += 1
-- 
cgit v1.2.3