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

[fix][web] not displaying the manually set electron version for suggestions and search results

Browse Source
This commit is contained in:
Vinícius Moreira
2019-12-23 14:30:14 -03:00
parent f6b380bf78
commit 3775a0640d
1 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,6 +155,10 @@ class WebApplicationManager(SoftwareManager):
return BeautifulSoup(url_res.text, 'lxml', parse_only=SoupStrainer('head')) return BeautifulSoup(url_res.text, 'lxml', parse_only=SoupStrainer('head'))
def search(self, words: str, disk_loader: DiskCacheLoader, limit: int = -1, is_url: bool = False) -> SearchResult: def search(self, words: str, disk_loader: DiskCacheLoader, limit: int = -1, is_url: bool = False) -> SearchResult:
local_config = {}
thread_config = Thread(target=self._fill_config_async, args=(local_config,))
thread_config.start()
res = SearchResult([], [], 0) res = SearchResult([], [], 0)
installed = self.read_installed(disk_loader=disk_loader, limit=limit).installed installed = self.read_installed(disk_loader=disk_loader, limit=limit).installed
@@ -245,6 +249,15 @@ class WebApplicationManager(SoftwareManager):
res.total += len(res.installed) res.total += len(res.installed)
res.total += len(res.new) res.total += len(res.new)
if res.new:
thread_config.join()
if local_config['environment']['electron']['version']:
for app in res.new:
app.version = local_config['environment']['electron']['version']
app.latest_version = app.version
return res return res
def _read_search_index(self) -> dict: def _read_search_index(self) -> dict:
@@ -765,7 +778,14 @@ class WebApplicationManager(SoftwareManager):
return PackageSuggestion(priority=SuggestionPriority(suggestion['priority']), package=app) return PackageSuggestion(priority=SuggestionPriority(suggestion['priority']), package=app)
def _fill_config_async(self, output: dict):
output.update(read_config())
def list_suggestions(self, limit: int, filter_installed: bool) -> List[PackageSuggestion]: def list_suggestions(self, limit: int, filter_installed: bool) -> List[PackageSuggestion]:
local_config = {}
thread_config = Thread(target=self._fill_config_async, args=(local_config,))
thread_config.start()
if self.suggestions: if self.suggestions:
suggestions = self.suggestions suggestions = self.suggestions
@@ -802,14 +822,21 @@ class WebApplicationManager(SoftwareManager):
else: else:
break break
if not self.env_settings and self.env_thread: if res:
self.env_thread.join() if not self.env_settings and self.env_thread:
self.env_thread = None # cleaning memory 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:
s.package.version = self.env_settings['electron']['version'] s.package.version = self.env_settings['electron']['version']
s.package.latest_version = s.package.version s.package.latest_version = s.package.version
thread_config.join()
if local_config and local_config['environment']['electron']['version']:
for s in res:
s.package.version = local_config['environment']['electron']['version']
s.package.latest_version = s.package.version
return res return res