From ab043cc31823d39914d7a1fe346566fd7ab6bc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Moreira?= <vinicius_fmoreira@hotmail.com>
Date: Mon, 16 Dec 2019 20:01:09 -0300
Subject: [PATCH] [wgem] begin: reading from index

---
 bauh/gems/web/controller.py | 29 ++++++++++++++++++++++++-----
 bauh/gems/web/worker.py     |  7 +++----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/bauh/gems/web/controller.py b/bauh/gems/web/controller.py
index ce27994e..471a32ec 100644
--- a/bauh/gems/web/controller.py
+++ b/bauh/gems/web/controller.py
@@ -25,7 +25,7 @@ from bauh.api.constants import DESKTOP_ENTRIES_DIR
 from bauh.commons.html import bold
 from bauh.commons.system import ProcessHandler, get_dir_size, get_human_size_str
 from bauh.gems.web import INSTALLED_PATH, nativefier, DESKTOP_ENTRY_PATH_PATTERN, URL_FIX_PATTERN, ENV_PATH, UA_CHROME, \
-    URL_SUGGESTIONS
+    URL_SUGGESTIONS, SEARCH_INDEX_FILE
 from bauh.gems.web.environment import EnvironmentUpdater
 from bauh.gems.web.model import WebApplication
 from bauh.gems.web.worker import SuggestionsDownloader, SearchIndexGenerator
@@ -180,14 +180,32 @@ class WebApplicationManager(SoftwareManager):
             if installed_matches:
                 res.installed.extend(installed_matches)
 
-            if self.search_index:
-                # TODO
-                pass
+            index = self._read_search_index()
+
+            if index:
+                split_words = lower_words.split(' ')
+                singleword = ''.join(lower_words)
+
+                app_keys = set()
+                for word in (*split_words, singleword):
+                    indexed = index.get(word)
+                    if indexed:
+                        app_keys.update(indexed)
+
+                print(indexed)
+                # TODO stopped here -> write suggestions to disk and read them here
 
         res.total += len(res.installed)
         res.total += len(res.new)
         return res
 
+    def _read_search_index(self) -> dict:
+        if os.path.exists(SEARCH_INDEX_FILE):
+            with open(SEARCH_INDEX_FILE) as f:
+                return yaml.safe_load(f.read())
+        else:
+            self.logger.warning("No search index found at {}".format(SEARCH_INDEX_FILE))
+
     def read_installed(self, disk_loader: DiskCacheLoader, limit: int = -1, only_apps: bool = False, pkg_types: Set[Type[SoftwarePackage]] = None, internet_available: bool = True) -> SearchResult:
         res = SearchResult([], [], 0)
 
@@ -591,8 +609,9 @@ class WebApplicationManager(SoftwareManager):
             to_map = suggestion_list if limit <= 0 else suggestion_list[0:limit]
             res = [self._map_suggestion(s) for s in to_map]
 
-            if not self.env_settings:
+            if not self.env_settings and self.env_thread:
                 self.env_thread.join()
+                self.env_thread = None  # cleaning memory
 
             if self.env_settings:
                 for s in res:
diff --git a/bauh/gems/web/worker.py b/bauh/gems/web/worker.py
index 256c7d67..3a007aac 100644
--- a/bauh/gems/web/worker.py
+++ b/bauh/gems/web/worker.py
@@ -40,16 +40,15 @@ class SearchIndexGenerator:
             name = sug.get('name')
 
             if name:
-                split_name = name.split(' ')
+                split_name = name.lower().strip().split(' ')
                 single_name = ''.join(split_name)
 
                 for word in (*split_name, single_name):
-                    word_key = word.lower().strip()
-                    mapped = index.get(word_key)
+                    mapped = index.get(word)
 
                     if not mapped:
                         mapped = set()
-                        index[word_key] = mapped
+                        index[word] = mapped
 
                     mapped.add(key)