spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-09 17:54:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

[wgem] begin: reading from index

Browse Source
This commit is contained in:
Vinícius Moreira
2019-12-16 20:01:09 -03:00
parent e73e36b9c2
commit ab043cc318
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
bauh/gems/web/controller.py
View File

@@ -25,7 +25,7 @@ from bauh.api.constants import DESKTOP_ENTRIES_DIR
from bauh.commons.html import bold from bauh.commons.html import bold
from bauh.commons.system import ProcessHandler, get_dir_size, get_human_size_str 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, \ 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.environment import EnvironmentUpdater
from bauh.gems.web.model import WebApplication from bauh.gems.web.model import WebApplication
from bauh.gems.web.worker import SuggestionsDownloader, SearchIndexGenerator from bauh.gems.web.worker import SuggestionsDownloader, SearchIndexGenerator
@@ -180,14 +180,32 @@ class WebApplicationManager(SoftwareManager):
if installed_matches: if installed_matches:
res.installed.extend(installed_matches) res.installed.extend(installed_matches)
if self.search_index: index = self._read_search_index()
# TODO
pass 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.installed)
res.total += len(res.new) res.total += len(res.new)
return res 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: 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) res = SearchResult([], [], 0)
@@ -591,8 +609,9 @@ class WebApplicationManager(SoftwareManager):
to_map = suggestion_list if limit <= 0 else suggestion_list[0:limit] to_map = suggestion_list if limit <= 0 else suggestion_list[0:limit]
res = [self._map_suggestion(s) for s in to_map] 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.join()
self.env_thread = None # cleaning memory
if self.env_settings: if self.env_settings:
for s in res: for s in res:

7
bauh/gems/web/worker.py
View File

@@ -40,16 +40,15 @@ class SearchIndexGenerator:
name = sug.get('name') name = sug.get('name')
if name: if name:
split_name = name.split(' ') split_name = name.lower().strip().split(' ')
single_name = ''.join(split_name) single_name = ''.join(split_name)
for word in (*split_name, single_name): for word in (*split_name, single_name):
word_key = word.lower().strip() mapped = index.get(word)
mapped = index.get(word_key)
if not mapped: if not mapped:
mapped = set() mapped = set()
index[word_key] = mapped index[word] = mapped
mapped.add(key) mapped.add(key)