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

[arch] fix: not filling cached data for installed suggestions

Browse Source
This commit is contained in:
Vinicius Moreira
2022-05-20 18:16:00 -03:00
parent 684248461b
commit fc29a1a7e9
3 changed files with 67 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
bauh/gems/arch/controller.py
View File

@@ -3714,6 +3714,17 @@ class ArchManager(SoftwareManager, SettingsController):
if suggestions:
output.update(suggestions)
def _fill_cached_if_unset(self, pkg: ArchPackage, loader: DiskCacheLoader):
data = loader.read(pkg)
if data:
for attr, cached_val in data.items():
if cached_val:
current_val = getattr(pkg, attr)
if current_val is None:
setattr(pkg, attr, cached_val)
def list_suggestions(self, limit: int, filter_installed: bool) -> Optional[List[PackageSuggestion]]:
if limit == 0:
return []
@@ -3791,6 +3802,11 @@ class ArchManager(SoftwareManager, SettingsController):
if full_data and full_data.get('signed'):
full_data = full_data['signed']
disk_loader, caching_threads = None, None
if not filter_installed:
disk_loader = self.context.disk_loader_factory.new()
caching_threads = list()
suggestions = []
for name in suggestion_by_priority:
pkg_data = available_suggestions[name]
@@ -3801,18 +3817,27 @@ class ArchManager(SoftwareManager, SettingsController):
description = pkg_full_data.get('description')
pkg_updates_ignored = pkg_data['i'] and ignored_updates and name in ignored_updates
pkg = ArchPackage(name=name,
version=pkg_data['v'],
latest_version=pkg_data['v'],
repository=pkg_data['r'],
installed=pkg_data['i'],
description=description,
categories=self.categories.get(name),
i18n=self.i18n,
maintainer=pkg_data['r'],
update_ignored=pkg_updates_ignored)
suggestions.append(PackageSuggestion(package=ArchPackage(name=name,
version=pkg_data['v'],
latest_version=pkg_data['v'],
repository=pkg_data['r'],
installed=pkg_data['i'],
description=description,
categories=self.categories.get(name),
i18n=self.i18n,
maintainer=pkg_data['r'],
update_ignored=pkg_updates_ignored),
priority=name_priority[name]))
if disk_loader:
t = Thread(target=self._fill_cached_if_unset, args=(pkg, disk_loader))
t.start()
caching_threads.append(t)
suggestions.append(PackageSuggestion(package=pkg, priority=name_priority[name]))
if caching_threads:
for t in caching_threads:
t.join()
return suggestions