SeachBuffer: Rename querystring_list to querystrings; remove querystring

Author: MaxGyver83

alot/buffers/search.py

@@ -21,8 +21,9 @@ class SearchBuffer(Buffer):
     def __init__(self, ui, initialquery='', sort_order=None):
         self.dbman = ui.dbman
         self.ui = ui
-        self.querystring = initialquery
-        self.querystring_list = [initialquery]
+        # We store a list of notmuch query strings and this buffer will
+        # display the results for each query one after the other
+        self.querystrings = [initialquery]
         default_order = settings.get('search_threads_sort_order')
         self.sort_order = sort_order or default_order
         self.result_count = 0
@@ -35,12 +36,13 @@ def __init__(self, ui, initialquery='', sort_order=None):
 
     def __str__(self):
         formatstring = '[search] for "%s" (%d message%s)'
-        return formatstring % (self.querystring, self.result_count,
+        return formatstring % ('" + "'.join(self.querystrings),
+                               self.result_count,
                                's' if self.result_count > 1 else '')
 
     def get_info(self):
         info = {}
-        info['querystring'] = '" + "'.join(self.querystring_list)
+        info['querystring'] = '" + "'.join(self.querystrings)
         info['result_count'] = self.result_count
         info['result_count_positive'] = 's' if self.result_count > 1 else ''
         return info
@@ -64,7 +66,7 @@ def rebuild(self, reverse=False):
 
         self.result_count = 0
         self.threadlist = None
-        for query in self.querystring_list:
+        for query in self.querystrings:
             try:
                 self.result_count += self.dbman.count_messages(query)
                 threads = self.dbman.get_threads(

alot/commands/globals.py

@@ -112,7 +112,7 @@ def apply(self, ui):
             open_searches = ui.get_buffers_of_type(buffers.SearchBuffer)
             to_be_focused = None
             for sb in open_searches:
-                if sb.querystring_list == [self.query]:
+                if sb.querystrings == [self.query]:
                     to_be_focused = sb
             if to_be_focused:
                 if ui.current_buffer != to_be_focused:

alot/commands/search.py

@@ -35,7 +35,7 @@ def apply(self, ui):
         if not self.thread:
             self.thread = ui.current_buffer.get_selected_thread()
         if self.thread:
-            query_list = ui.current_buffer.querystring_list
+            query_list = ui.current_buffer.querystrings
             logging.info('open thread view for %s', self.thread)
 
             tb = buffers.ThreadBuffer(ui, self.thread)
@@ -71,9 +71,9 @@ def __init__(self, query=None, sort=None, **kwargs):
     def apply(self, ui):
         if self.querystring or self.sort_order:
             sbuffer = ui.current_buffer
-            oldquery = sbuffer.querystring
+            oldquery = sbuffer.querystrings[-1]
             if self.querystring not in [None, oldquery]:
-                sbuffer.querystring_list[-1] = self.querystring
+                sbuffer.querystrings[-1] = self.querystring
                 sbuffer = ui.current_buffer
             if self.sort_order:
                 sbuffer.sort_order = self.sort_order
@@ -91,7 +91,7 @@ class RefinePromptCommand(Command):
 
     async def apply(self, ui):
         sbuffer = ui.current_buffer
-        oldquery = sbuffer.querystring_list[-1]
+        oldquery = sbuffer.querystrings[-1]
         return await ui.apply_command(PromptCommand('refine ' + oldquery))
 
 
@@ -124,7 +124,7 @@ def __init__(self, query, sort=None, **kwargs):
     def apply(self, ui):
         if self.query:
             sbuffer = ui.current_buffer
-            sbuffer.querystring_list.append(self.query)
+            sbuffer.querystrings.append(self.query)
             sbuffer.rebuild()
             ui.update()
         else:
@@ -210,7 +210,7 @@ async def apply(self, ui):
         if threadline_widget is None:
             return
 
-        testquery = searchbuffer.querystring
+        testquery = searchbuffer.querystrings[-1]
         thread = threadline_widget.get_thread()
         if not self.allm:
             testquery = "(%s) AND thread:%s" % (testquery,
@@ -232,7 +232,7 @@ def refresh():
                 else:
                     threadline_widget.rebuild()
                 searchbuffer.result_count = searchbuffer.dbman.count_messages(
-                    searchbuffer.querystring)
+                    searchbuffer.querystrings[-1])
             else:
                 searchbuffer.rebuild()
 
@@ -299,5 +299,5 @@ class SaveQueryCommand(GlobalSaveQueryCommand):
     def apply(self, ui):
         searchbuffer = ui.current_buffer
         if not self.query:
-            self.query = searchbuffer.querystring
+            self.query = searchbuffer.querystrings[-1]
         GlobalSaveQueryCommand.apply(self, ui)