Address review comments from Jendrik

Author: RJ722

rednotebook/data.py

@@ -18,6 +18,7 @@
 
 import datetime
 import re
+import sys
 
 
 TEXT_RESULT_LENGTH = 42
@@ -201,38 +202,36 @@ def search(self, words, tags):
             if add_text_to_results:
                 results.append(get_text_with_dots(self.text, 0, TEXT_RESULT_LENGTH))
         else:
-            for word in words:
-                # Any of the word matches with the date.
-                if word in str(self):
-                    # We don't want to show search results from the text matching
-                    # this date.
-                    words.remove(word)
-                    results.append(get_text_with_dots(self.text, 0, TEXT_RESULT_LENGTH))
-            # if all the words matched agains the date, return
-            if not words:
-                return str(self), words
-            text_result = self.search_in_text(words)
+            non_date_words = [word for word in words if word not in str(self)]
+            words_contain_date = len(non_date_words) != len(words)
+            if words_contain_date:
+                results.append(get_text_with_dots(self.text, 0, TEXT_RESULT_LENGTH))
+            # If all the words matched agains the date, return.
+            if not non_date_words:
+                return str(self), results
+
+            text_result = self.search_in_text(non_date_words)
             if text_result:
                 results.append(text_result)
-            results.extend(self.search_in_categories(words))
+            results.extend(self.search_in_categories(non_date_words))
         return str(self), results
 
     def search_in_text(self, words):
-        """All words should be present in the text"""
-        matches = {}
+        """
+        If all words are in the text, return a suitable text substring.
+        Otherwise, return None.
+        """
+        match_word, smallest_index = None, sys.maxsize
         for word in words:
-            index = self.text.upper().find(word.upper())
+            index = self.text.lower().find(word.lower())
             if index < 0:
                 return
-            matches[word] = index
-
-        # Of all the matching words, find the one which appears first
-        match_word = min(matches, key=matches.get)
-        first_occurrence = matches[match_word]
+            if index < smallest_index:
+                match_word, smallest_index = word, index
 
-        found_text = self.text[first_occurrence : first_occurrence + len(match_word)]
+        found_text = self.text[smallest_index : smallest_index + len(match_word)]
         return get_text_with_dots(
-            self.text, first_occurrence, first_occurrence + len(match_word), found_text
+            self.text, smallest_index, smallest_index + len(match_word), found_text
         )
 
     def search_in_categories(self, words):

rednotebook/gui/browser.py

@@ -68,9 +68,9 @@ def set_font_size(self, size):
         def highlight(self, search_words):
             # Tell the webview which text to highlight after the html is loaded
             self.search_words = search_words
-            for query in search_words:
+            for word in search_words:
                 self.get_find_controller().search(
-                    query, WebKit2.FindOptions.CASE_INSENSITIVE, MAX_HITS
+                    word, WebKit2.FindOptions.CASE_INSENSITIVE, MAX_HITS
                 )
 
         def on_load_changed(self, webview, event):

rednotebook/gui/main_window.py

@@ -814,9 +814,9 @@ def _get_buffer(self, key, text):
     def _get_buffer_for_day(self, day):
         return self._get_buffer(day.date, day.text)
 
-    def scroll_to_text(self, words):
+    def scroll_to_non_date_text(self, words):
         """
-        Finds the first non-date word in words, and passes it on to
+        Find the first non-date word in words, and pass it on to
         `Editor.scroll_to_text`.
         """
         for word in words:
@@ -835,7 +835,7 @@ def show_day(self, new_day):
 
         if self.search_words:
             # If a search is currently made, scroll to the text and return.
-            GObject.idle_add(self.scroll_to_text, self.search_words)
+            GObject.idle_add(self.scroll_to_non_date_text, self.search_words)
             GObject.idle_add(self.highlight, self.search_words)
             return
 

rednotebook/gui/search.py

@@ -59,12 +59,12 @@ def search(self, search_text):
             else:
                 words.append(part)
 
-        # Highlight all occurrences in the current day's text
+        # Highlight all occurrences in the current day's text.
         self.main_window.highlight_text(words)
 
         # Scroll to query.
         if words:
-            self.main_window.day_text_field.scroll_to_text(tags + words)
+            self.main_window.day_text_field.scroll_to_non_date_text(tags + words)
 
         self.main_window.search_tree_view.update_data(words, tags)