From 200bce7d7edd969eea438182445da17c18e9f5cb Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Fri, 9 Feb 2024 15:57:58 +0100 Subject: [PATCH 1/2] better goldwarden command path detection in this way works always --- ui/goldwarden.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ui/goldwarden.py b/ui/goldwarden.py index 0586d4a..e0973bb 100644 --- a/ui/goldwarden.py +++ b/ui/goldwarden.py @@ -1,13 +1,19 @@ import subprocess import json +from shutil import which import os +import sys # if flatpak if os.path.exists("/app/bin/goldwarden"): BINARY_PATH = "/app/bin/goldwarden" else: - res = subprocess.run(["which", "goldwarden"]) - BINARY_PATH = res.stdout.decode("utf-8").strip() + BINARY_PATH = which('goldwarden') + if isinstance(BINARY_PATH,str): + BINARY_PATH = BINARY_PATH.strip() + else: + print("goldwarden executable not found") + sys.exit() def set_api_url(url): restic_cmd = f"{BINARY_PATH} config set-api-url {url}" @@ -181,4 +187,4 @@ def run_daemon(): print(line.decode("utf-8")) result.wait() print("quitting goldwarden daemon") - return result.returncode \ No newline at end of file + return result.returncode From 417567f5494af413976aaa34b00fda04a41ba8eb Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Fri, 9 Feb 2024 16:01:13 +0100 Subject: [PATCH 2/2] PyGIWarning: Gtk was imported without specifying a version first --- ui/monitors/dbus_autofill_monitor.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/monitors/dbus_autofill_monitor.py b/ui/monitors/dbus_autofill_monitor.py index e7a29a3..bdc0dcc 100644 --- a/ui/monitors/dbus_autofill_monitor.py +++ b/ui/monitors/dbus_autofill_monitor.py @@ -1,6 +1,9 @@ #Python DBUS Test Server #runs until the Quit() method is called via DBUS +from gi import require_version +require_version('Gtk', '4.0') +require_version('Adw', '1') from gi.repository import Gtk import dbus import dbus.service