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

[flatpak] fix: not displaying update components not associated with installed packages

Browse Source
This commit is contained in:
Vinicius Moreira
2021-11-09 11:47:36 -03:00
parent e539eea6f6
commit 8488b086e6
4 changed files with 113 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [0.9.21] 2021 ## [0.9.21] 2021
### Fixes ### Fixes
- Flatpak
- not displaying update components not associated with installed packages
- UI - UI
- upgrade summary: not displaying the icon type for some applications - upgrade summary: not displaying the icon type for some applications

117
bauh/gems/flatpak/controller.py
View File

@@ -128,48 +128,63 @@ class FlatpakManager(SoftwareManager):
thread_updates = None thread_updates = None
installed = flatpak.list_installed(version) installed = flatpak.list_installed(version)
models = []
update_map = None
if thread_updates:
thread_updates.join()
update_map = updates[0]
models = {}
if installed: if installed:
update_map = None
if thread_updates:
thread_updates.join()
update_map = updates[0]
for app_json in installed: for app_json in installed:
model = self._map_to_model(app_json=app_json, installed=True, model = self._map_to_model(app_json=app_json, installed=True,
disk_loader=disk_loader, internet=internet_available) disk_loader=disk_loader, internet=internet_available)
model.update = None model.update = False
models.append(model) models[model.get_update_id(version)] = model
if update_map and (update_map['full'] or update_map['partial']): if update_map:
if version >= VERSION_1_2: for update_id in update_map['full']:
update_id = '{}/{}/{}'.format(app_json['id'], app_json['branch'], app_json['installation']) model_with_update = models.get(update_id)
if model_with_update:
model_with_update.update = True
else:
# it is a new component that must be installed
update_id_split = update_id.split('/')
new_app = FlatpakApplication(id=update_id_split[0],
branch=update_id_split[1],
installation=update_id_split[2],
name=update_id_split[0].split('.')[-1].strip(),
version=update_id_split[1],
arch='x86_64' if self.context.is_system_x86_64() else 'x86',
origin=update_id_split[3] if len(update_id_split) == 4 else None)
new_app.update_component = True # mark as "update component"
new_app.installed = True # faking the "installed" status to be displayed as an update
new_app.update = True
new_app.update_ref()
models[update_id] = new_app
if update_map['full'] and update_id in update_map['full']: if version >= VERSION_1_2:
model.update = True for partial_update_id in update_map['partial']:
partial_data = partial_update_id.split['/']
if update_map['partial']: for model_update_id, model in models.items():
for partial in update_map['partial']: if model.installation == partial_data[2] and model_update_id in partial_data[0] and \
partial_data = partial.split('/') model.branch == partial_data[1]:
if app_json['id'] in partial_data[0] and\ partial_model = model.gen_partial(partial_data[0])
app_json['branch'] == partial_data[1] and\ partial_model.update = True
app_json['installation'] == partial_data[2]: models[partial_update_id] = partial_model
partial_model = model.gen_partial(partial.split('/')[0]) break
partial_model.update = True
models.append(partial_model)
else:
model.update = '{}/{}'.format(app_json['installation'], app_json['ref']) in update_map['full']
if models: if models:
ignored = self._read_ignored_updates() ignored = self._read_ignored_updates()
if ignored: if ignored:
for model in models: for model in models.values():
if model.get_update_ignore_key() in ignored: if model.get_update_ignore_key() in ignored:
model.updates_ignored = True model.updates_ignored = True
return SearchResult(models, None, len(models)) return SearchResult([*models.values()], None, len(models))
def downgrade(self, pkg: FlatpakApplication, root_password: str, watcher: ProcessWatcher) -> bool: def downgrade(self, pkg: FlatpakApplication, root_password: str, watcher: ProcessWatcher) -> bool:
if not self._make_exports_dir(watcher): if not self._make_exports_dir(watcher):
@@ -217,10 +232,16 @@ class FlatpakManager(SoftwareManager):
ref = req.pkg.base_ref ref = req.pkg.base_ref
try: try:
res, _ = ProcessHandler(watcher).handle_simple(flatpak.update(app_ref=ref, if req.pkg.update_component:
installation=req.pkg.installation, res, _ = ProcessHandler(watcher).handle_simple(flatpak.install(app_id=ref,
related=related, installation=req.pkg.installation,
deps=deps)) origin=req.pkg.origin))
else:
res, _ = ProcessHandler(watcher).handle_simple(flatpak.update(app_ref=ref,
installation=req.pkg.installation,
related=related,
deps=deps))
watcher.change_substatus('') watcher.change_substatus('')
if not res: if not res:
@@ -253,23 +274,33 @@ class FlatpakManager(SoftwareManager):
def get_info(self, app: FlatpakApplication) -> dict: def get_info(self, app: FlatpakApplication) -> dict:
if app.installed: if app.installed:
version = flatpak.get_version() if app.update_component:
id_ = app.base_id if app.partial and version < VERSION_1_5 else app.id app_info = {'id': app.id,
app_info = flatpak.get_app_info_fields(id_, app.branch, app.installation) 'name': app.name,
'branch': app.branch,
'installation': app.installation,
'origin': app.origin,
'arch': app.arch,
'ref': app.ref,
'type': self.i18n['unknown']}
else:
version = flatpak.get_version()
id_ = app.base_id if app.partial and version < VERSION_1_5 else app.id
app_info = flatpak.get_app_info_fields(id_, app.branch, app.installation)
if app.partial and version < VERSION_1_5: if app.partial and version < VERSION_1_5:
app_info['id'] = app.id app_info['id'] = app.id
app_info['ref'] = app.ref app_info['ref'] = app.ref
app_info['name'] = app.name app_info['name'] = app.name
app_info['type'] = 'runtime' if app.runtime else 'app' app_info['type'] = 'runtime' if app.runtime else 'app'
app_info['description'] = strip_html(app.description) if app.description else '' app_info['description'] = strip_html(app.description) if app.description else ''
if app.installation: if app.installation:
app_info['installation'] = app.installation app_info['installation'] = app.installation
if app_info.get('installed'): if app_info.get('installed'):
app_info['installed'] = app_info['installed'].replace('?', ' ') app_info['installed'] = app_info['installed'].replace('?', ' ')
return app_info return app_info
else: else:

9
bauh/gems/flatpak/flatpak.py
View File

@@ -15,6 +15,7 @@ from bauh.gems.flatpak import EXPORTS_PATH, VERSION_1_3, VERSION_1_2, VERSION_1_
RE_SEVERAL_SPACES = re.compile(r'\s+') RE_SEVERAL_SPACES = re.compile(r'\s+')
RE_COMMIT = re.compile(r'(Latest commit|Commit)\s*:\s*(.+)') RE_COMMIT = re.compile(r'(Latest commit|Commit)\s*:\s*(.+)')
OPERATION_UPDATE_SYMBOLS = {'i', 'u'}
def get_app_info_fields(app_id: str, branch: str, installation: str, fields: List[str] = [], check_runtime: bool = False): def get_app_info_fields(app_id: str, branch: str, installation: str, fields: List[str] = [], check_runtime: bool = False):
@@ -208,12 +209,14 @@ def read_updates(version: Version, installation: str) -> Dict[str, set]:
if len(line_split) > 2: if len(line_split) > 2:
if version >= VERSION_1_5: if version >= VERSION_1_5:
update_id = '{}/{}/{}'.format(line_split[2], line_split[3], installation) update_id = f'{line_split[2]}/{line_split[3]}/{installation}/{line_split[5]}'
elif version >= VERSION_1_2:
update_id = f'{line_split[2]}/{line_split[4]}/{installation}/{line_split[5]}'
else: else:
update_id = '{}/{}/{}'.format(line_split[2], line_split[4], installation) update_id = '{}/{}/{}'.format(line_split[2], line_split[4], installation)
if len(line_split) >= 6: if version >= VERSION_1_3 and len(line_split) >= 6:
if line_split[4] != 'i': if line_split[4].strip().lower() in OPERATION_UPDATE_SYMBOLS:
if '(partial)' in line_split[-1]: if '(partial)' in line_split[-1]:
res['partial'].add(update_id) res['partial'].add(update_id)
else: else:

43
bauh/gems/flatpak/model.py
View File

@@ -1,6 +1,8 @@
from packaging.version import Version
from bauh.api.abstract.model import SoftwarePackage, PackageStatus from bauh.api.abstract.model import SoftwarePackage, PackageStatus
from bauh.commons import resource from bauh.commons import resource
from bauh.gems.flatpak import ROOT_DIR from bauh.gems.flatpak import ROOT_DIR, VERSION_1_2, VERSION_1_5
from bauh.view.util.translation import I18n from bauh.view.util.translation import I18n
@@ -23,6 +25,7 @@ class FlatpakApplication(SoftwarePackage):
self.base_id = None self.base_id = None
self.base_ref = None self.base_ref = None
self.updates_ignored = updates_ignored self.updates_ignored = updates_ignored
self.update_component = False # if it is a new app/runtime that has come as an update
if runtime: if runtime:
self.categories = ['runtime'] self.categories = ['runtime']
@@ -31,13 +34,13 @@ class FlatpakApplication(SoftwarePackage):
return self.description is None and self.icon_url return self.description is None and self.icon_url
def has_history(self) -> bool: def has_history(self) -> bool:
return not self.partial and self.installed and self.ref return not self.partial and not self.update_component and self.installed and self.ref
def has_info(self): def has_info(self):
return bool(self.id) return bool(self.id)
def can_be_downgraded(self): def can_be_downgraded(self):
return not self.partial and self.installed and self.ref return not self.partial and not self.update_component and self.installed and self.ref
def get_type(self): def get_type(self):
return 'flatpak' return 'flatpak'
@@ -49,20 +52,21 @@ class FlatpakApplication(SoftwarePackage):
return self.get_default_icon_path() return self.get_default_icon_path()
def is_application(self): def is_application(self):
return not self.runtime and not self.partial return not self.runtime and not self.partial and not self.update_component
def get_disk_cache_path(self): def get_disk_cache_path(self):
return super(FlatpakApplication, self).get_disk_cache_path() + '/installed/' + self.id return super(FlatpakApplication, self).get_disk_cache_path() + '/installed/' + self.id
def get_data_to_cache(self): def get_data_to_cache(self):
return { if not self.update_component:
'description': self.description, return {
'icon_url': self.icon_url, 'description': self.description,
'latest_version': self.latest_version, 'icon_url': self.icon_url,
'version': self.version, 'latest_version': self.latest_version,
'name': self.name, 'version': self.version,
'categories': self.categories 'name': self.name,
} 'categories': self.categories
}
def fill_cached_data(self, data: dict): def fill_cached_data(self, data: dict):
for attr in self.get_data_to_cache().keys(): for attr in self.get_data_to_cache().keys():
@@ -70,7 +74,7 @@ class FlatpakApplication(SoftwarePackage):
setattr(self, attr, data[attr]) setattr(self, attr, data[attr])
def can_be_run(self) -> bool: def can_be_run(self) -> bool:
return self.installed and not self.runtime and not self.partial return self.installed and not self.runtime and not self.partial and not self.update_component
def get_publisher(self): def get_publisher(self):
return self.origin return self.origin
@@ -124,3 +128,16 @@ class FlatpakApplication(SoftwarePackage):
def get_disk_icon_path(self) -> str: def get_disk_icon_path(self) -> str:
if not self.runtime: if not self.runtime:
return super(FlatpakApplication, self).get_disk_icon_path() return super(FlatpakApplication, self).get_disk_icon_path()
def get_update_id(self, flatpak_version: Version) -> str:
if flatpak_version >= VERSION_1_2:
return f'{self.id}/{self.branch}/{self.installation}/{self.origin}'
else:
return f'{self.installation}/{self.ref}'
def can_be_uninstalled(self) -> bool:
return not self.update_component and super(FlatpakApplication, self).can_be_uninstalled()
def update_ref(self):
if self.id and self.arch and self.branch:
self.ref = f'{self.id}/{self.arch}/{self.branch}'