From c0193a66bf9a8726bcd2000e4bc6aee1dc0d7835 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Wed, 12 Jun 2019 18:35:07 -0300 Subject: [PATCH] Fix to work with flatpak 1.0 --- core/flatpak.py | 6 +++--- core/model.py | 4 ++-- view/qt/window.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/flatpak.py b/core/flatpak.py index c1d1d882..d50acbea 100755 --- a/core/flatpak.py +++ b/core/flatpak.py @@ -40,9 +40,9 @@ def _package_str_to_json(line: str, version: str) -> dict: return app -def _run_cmd(cmd: str, expected_code: int = 0) -> str: +def _run_cmd(cmd: str, expected_code: int = 0, ignore_return_code: bool = False) -> str: res = subprocess.run(cmd, shell=True, stdout=subprocess.PIPE) - return res.stdout.decode() if res.returncode == expected_code else None + return res.stdout.decode() if ignore_return_code or res.returncode == expected_code else None def get_version(): @@ -75,4 +75,4 @@ def update(ref: str): def list_updates(): - return _run_cmd('flatpak update', expected_code=1) + return _run_cmd('flatpak update', ignore_return_code=True) diff --git a/core/model.py b/core/model.py index de67285a..71747001 100755 --- a/core/model.py +++ b/core/model.py @@ -47,10 +47,10 @@ class FlatpakManager: pak_data = None if not pak_data: - pak['latest_release'] = None + pak['latest_version'] = None pak['icon'] = None else: - pak['latest_release'] = pak_data['currentReleaseVersion'] + pak['latest_version'] = pak_data['currentReleaseVersion'] pak['icon'] = pak_data['iconDesktopUrl'] if pak['icon'].startswith('/'): diff --git a/view/qt/window.py b/view/qt/window.py index 10ee7235..55959838 100755 --- a/view/qt/window.py +++ b/view/qt/window.py @@ -40,7 +40,7 @@ class UpdateToggleButton(QToolButton): class MainWindow(QWidget): - __COLUMNS__ = ['Package', 'Version', 'Branch', 'Arch', 'Ref', 'Latest Release', 'Origin', 'Update ?'] + __COLUMNS__ = ['Package', 'Version', 'Branch', 'Arch', 'Ref', 'Latest Version', 'Origin', 'Update ?'] __BASE_HEIGHT__ = 400 def __init__(self, controller: FlatpakController): @@ -239,7 +239,7 @@ class MainWindow(QWidget): self.table_apps.setItem(idx, 4, col_package) col_release = QTableWidgetItem() - col_release.setText(app['latest_release']) + col_release.setText(app['latest_version']) col_release.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled) self.table_apps.setItem(idx, 5, col_release)