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

[view.qt.systray] fix: not able to call to notify updates (AppImage package)

Browse Source
This commit is contained in:
Vinicius Moreira
2021-12-23 13:58:12 -03:00
parent 68ce25b287
commit b24b1eb5cf
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -7,7 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [0.9.25] ## [0.9.25]
### Fixes ### Fixes
- AppImage package - AppImage package
- not able to reinitialize (e.g: when settings are changed) - not able to reinitialize (e.g: when settings are changed)
- tray mode: not able to call `bauh-cli` to notify updates
## [0.9.24] 2021-12-17 ## [0.9.24] 2021-12-17
### Features ### Features

12
bauh/view/qt/systray.py
View File

@@ -16,7 +16,7 @@ from PyQt5.QtWidgets import QSystemTrayIcon, QMenu
from bauh import __app_name__, ROOT_DIR from bauh import __app_name__, ROOT_DIR
from bauh.api.abstract.model import PackageUpdate from bauh.api.abstract.model import PackageUpdate
from bauh.api.http import HttpClient from bauh.api.http import HttpClient
from bauh.commons.system import run_cmd from bauh.commons import system
from bauh.context import generate_i18n from bauh.context import generate_i18n
from bauh.view.core.tray_client import TRAY_CHECK_FILE from bauh.view.core.tray_client import TRAY_CHECK_FILE
from bauh.view.core.update import check_for_update from bauh.view.core.update import check_for_update
@@ -29,6 +29,9 @@ CLI_NAME = f'{__app_name__}-cli'
def get_cli_path() -> str: def get_cli_path() -> str:
if os.getenv('APPIMAGE'):
return CLI_NAME
venv = os.getenv('VIRTUAL_ENV') venv = os.getenv('VIRTUAL_ENV')
if venv: if venv:
@@ -48,9 +51,12 @@ def get_cli_path() -> str:
def list_updates(logger: logging.Logger) -> List[PackageUpdate]: def list_updates(logger: logging.Logger) -> List[PackageUpdate]:
cli_path = get_cli_path() cli_path = get_cli_path()
if cli_path: if cli_path:
output = run_cmd(f'{cli_path} updates -f json') exitcode, output = system.execute(f'{cli_path} updates -f json', custom_env=dict(os.environ))
if output: if exitcode != 0:
output_log = output.replace('\n', ' ') if output else ' '
logger.warning(f'Command "{CLI_NAME} updates" returned an unexpected exitcode ({exitcode}). Output: {output_log}')
elif output:
return [PackageUpdate(pkg_id=o['id'], name=o['name'], version=o['version'], pkg_type=o['type']) for o in json.loads(output)] return [PackageUpdate(pkg_id=o['id'], name=o['name'], version=o['version'], pkg_type=o['type']) for o in json.loads(output)]
else: else:
logger.info("No updates found") logger.info("No updates found")