Enable concatenation of search queries (split by " / ")

alot/buffers/search.py

@@ -61,20 +61,26 @@ def rebuild(self, reverse=False):
         if exclude_tags:
             exclude_tags = [t for t in exclude_tags.split(';') if t]
 
-        try:
-            self.result_count = self.dbman.count_messages(self.querystring)
-            threads = self.dbman.get_threads(
-                self.querystring, order, exclude_tags)
-        except NotmuchError:
-            self.ui.notify('malformed query string: %s' % self.querystring,
-                           'error')
-            self.listbox = urwid.ListBox([])
-            self.body = self.listbox
-            return
-
-        self.threadlist = IterableWalker(threads, ThreadlineWidget,
-                                         dbman=self.dbman,
-                                         reverse=reverse)
+        querylist = self.querystring.split(' / ')
+        for query in querylist:
+            try:
+                self.result_count = self.dbman.count_messages(query)
+                threads = self.dbman.get_threads(
+                    query, order, exclude_tags)
+            except NotmuchError:
+                self.ui.notify('malformed query string: %s' % query,
+                               'error')
+                self.listbox = urwid.ListBox([])
+                self.body = self.listbox
+                return
+
+            iterablewalker = IterableWalker(threads, ThreadlineWidget,
+                                            dbman=self.dbman,
+                                            reverse=reverse)
+            if self.threadlist:
+                self.threadlist.append(iterablewalker)
+            else:
+                self.threadlist = iterablewalker
 
         self.listbox = urwid.ListBox(self.threadlist)
         self.body = self.listbox

alot/walker.py

@@ -6,6 +6,11 @@
 import urwid
 
 
+def chain(*iterables):
+    for iterable in iterables:
+        yield from iterable
+
+
 class IterableWalker(urwid.ListWalker):
 
     """An urwid walker for iterables.
@@ -92,3 +97,6 @@ def _get_next_item(self):
 
     def get_lines(self):
         return self.lines
+
+    def append(self, iterableWalker):
+        self.iterable = chain(self.iterable, iterableWalker.iterable)