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

[flatpak] new model update for Flatpak 1.4.X

Browse Source
This commit is contained in:
Vinicius Moreira
2020-01-13 15:47:33 -03:00
parent 8dd114da85
commit 4a26381c04
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,7 @@ class FlatpakManager(SoftwareManager):
models.append(model)
if update_map and (update_map['full'] or update_map['partial']):
if version >= '1.5.0':
if version >= '1.4.0':
update_id = '{}/{}/{}'.format(app_json['id'], app_json['branch'], app_json['installation'])
if update_map['full'] and update_id in update_map['full']:

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

@@ -194,17 +194,21 @@ def read_updates(version: str, installation: str) -> Dict[str, set]:
else:
updates = new_subprocess([BASE_CMD, 'update', '--{}'.format(installation)]).stdout
reg = r'[0-9]+\.\s+.+' if version >= '1.5.0' else r'[0-9]+\.\s+(\w+|\.)+\s+\w+\s+(\w|\.)+'
reg = r'[0-9]+\.\s+.+'
try:
for o in new_subprocess(['grep', '-E', reg, '-o', '--color=never'], stdin=updates).stdout:
if o:
line_split = o.decode().strip().split('\t')
update_id = '{}/{}/{}'.format(line_split[2], line_split[3], installation)
if len(line_split) == 7:
if version >= '1.5.0':
update_id = '{}/{}/{}'.format(line_split[2], line_split[3], installation)
else:
update_id = '{}/{}/{}'.format(line_split[2], line_split[4], installation)
if len(line_split) >= 6:
if line_split[4] != 'i':
if '(partial)' in line_split[6]:
if '(partial)' in line_split[-1]:
res['partial'].add(update_id)
else:
res['full'].add(update_id)

4
bauh/view/qt/window.py
View File

@@ -846,8 +846,8 @@ class ManageWindow(QWidget):
new_width = max(table_width, toolbar_width, topbar_width)
# if self.bt_upgrade.isVisible():
# new_width *= 1.03 # this extra size is not because of the toolbar button, but the table upgrade buttons
if self.bt_upgrade.isVisible():
new_width *= 1.05 # this extra size is not because of the toolbar button, but the table upgrade buttons
if (self.pkgs and accept_lower_width) or new_width > self.width():
self.resize(new_width, self.height())