diff --git a/dzgui/init/prereqs.py b/dzgui/init/prereqs.py index 91278048..122ebb68 100644 --- a/dzgui/init/prereqs.py +++ b/dzgui/init/prereqs.py @@ -23,7 +23,7 @@ def has_flatpak_client() -> bool: else: return False except Exception as e: - logger.critical(e) + logger.debug(e) return False diff --git a/dzgui/util/strings.py b/dzgui/util/strings.py index 79512986..575175c5 100644 --- a/dzgui/util/strings.py +++ b/dzgui/util/strings.py @@ -347,7 +347,9 @@ thanks = Thanks( "scandalouss", "SnackSBR", "StevelDusa", + "sylvaingirardbe", "Thoughtduck216", + "u-alexandru", ], ) diff --git a/dzgui/views/dialogs/boot.py b/dzgui/views/dialogs/boot.py index 5a8a7181..a737caac 100644 --- a/dzgui/views/dialogs/boot.py +++ b/dzgui/views/dialogs/boot.py @@ -19,7 +19,7 @@ from dzgui.views.components.buttons import ClipboardButton from dzgui.views.mixins.colorscheme import ColorAwareApp gi.require_version("Gtk", "3.0") -from gi.repository import Gtk, GLib, Gdk +from gi.repository import Gtk, GLib, Gdk, Pango if TYPE_CHECKING: from dzgui.config.xdg import Xdg @@ -95,7 +95,7 @@ class BootDialog(ColorAwareApp, Gtk.Dialog): # type: ignore margin_top=30, margin_bottom=30, ) - self.error_label = Gtk.Label(margin_start=15, margin_end=15) + self.error_label = Gtk.Label(margin_start=15, margin_end=15, wrap=True, wrap_mode=Pango.WrapMode.WORD) # TODO: abstract class self.copy_button = ClipboardButton(self.error_label.get_text) diff --git a/scripts/parse_toml.py b/scripts/parse_toml.py index e4b52109..612f832d 100644 --- a/scripts/parse_toml.py +++ b/scripts/parse_toml.py @@ -1,8 +1,9 @@ import tomllib from shared import get_git_root +from typing import Any -def get_entrypoint() -> None: +def get_entrypoint() -> Any: root = get_git_root() p = root.joinpath("pyproject.toml") with open(p, "rb") as f: diff --git a/scripts/prebuild.py b/scripts/prebuild.py index 143bc564..cdf97f2c 100644 --- a/scripts/prebuild.py +++ b/scripts/prebuild.py @@ -52,7 +52,7 @@ def untar(file: str, glob: str, renamed: str) -> None: os.rename(_dir, build_dir.joinpath(renamed)) -def install_deps() -> None: +def install_deps() -> int: pip = build_dir.joinpath(f"{CPYTHON_BUILD}/bin/pip") proc = subprocess.run([pip, "install", root]) return proc.returncode @@ -65,12 +65,12 @@ def repackage() -> None: tar.add(build_dir.joinpath(CPYTHON_BUILD), arcname="python") -def rebuild_cpython() -> None: +def rebuild_cpython() -> str: if cpython_dir.is_dir() is False: get_cpython() code = install_deps() if code != 0: - return + return "" repackage() return get_packaged_version() diff --git a/scripts/release.py b/scripts/release.py index 2afaf47c..934ef7c9 100644 --- a/scripts/release.py +++ b/scripts/release.py @@ -92,8 +92,8 @@ with tarfile.open(tarpath, "w:gz") as tar: tar.add(subfolder, arcname=appname, filter=update_uname) print(f"Wrote tarfile to '{tarpath}'") -proc = subprocess.run([release_exe, "-v"], capture_output=True, text=True) -assert proc.stdout.rstrip() == version +built_proc = subprocess.run([release_exe, "-v"], capture_output=True, text=True) +assert str(built_proc.stdout).rstrip() == version # TODO: clean up staging directory release_exe.unlink() diff --git a/scripts/scrot.py b/scripts/scrot.py index 38001972..be400d49 100644 --- a/scripts/scrot.py +++ b/scripts/scrot.py @@ -8,7 +8,13 @@ def get_image_path() -> Path: return get_git_root().joinpath("dzgui/data/images/example.png") -p = get_image_path() -app = build_gui("", False) -app.set_automation_param("screenshot_path", p) -app.run(None) +def take_screenshot() -> None: + p = get_image_path() + app = build_gui("", False) + if app is None: + return + app.set_automation_param("screenshot_path", p) + app.run(None) + + +take_screenshot() diff --git a/scripts/untracked.py b/scripts/untracked.py index f53714d0..198345ff 100644 --- a/scripts/untracked.py +++ b/scripts/untracked.py @@ -3,14 +3,9 @@ import subprocess import sys cmd = ["git", "ls-files", "--others", "--exclude-standard"] -result = subprocess.Popen( - cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True -) -with open(".gitignore", "r") as f: - ignored = [line.rstrip() for line in f] - -untracked = [os.path.basename(line.rstrip()) for line in result.stdout] -for file in untracked: - if not any(file in item for item in ignored): - print(f"File '{file}' is untracked. Add to .gitignore file if this is intended.") - sys.exit(1) +result = subprocess.run(cmd, capture_output=True, text=True) +untracked = [os.path.basename(line.rstrip()) for line in result.stdout.splitlines()] +if bool(untracked): + print("The following files are untracked. Add to .gitignore if this is intended.") + print("\n".join(untracked)) + sys.exit(1) diff --git a/tests/test_process_detection.py b/tests/test_process_detection.py index f57ced35..097790d4 100644 --- a/tests/test_process_detection.py +++ b/tests/test_process_detection.py @@ -1,80 +1,93 @@ import pytest -import unittest -from unittest.mock import patch -from typing import Any +from typing import Literal, TYPE_CHECKING from dzgui.const.constants import ( FLATPAK_APPID, FLATPAK_ROOT_PATH, - FLATPAK_RUN_CMD, - FLATPAK_SANDBOX, ) from dzgui.init import proc +if TYPE_CHECKING: + from _pytest.monkeypatch import MonkeyPatch + pytestmark = pytest.mark.flatpak -class TestSteamDetection(unittest.TestCase): - def test_flatpak_detection_with_multiple_running_apps(self) -> None: - def flatpak_output(args: Any, *, text: str) -> str: - # Default 'flatpak ps' includes instance, PID, app and runtime columns. - if args == ["flatpak", "ps", "--columns=application"]: - return f"com.spotify.Client\n{FLATPAK_APPID}\n{FLATPAK_APPID}\n" - return f"3904921611\t1257689\t{FLATPAK_APPID}\torg.freedesktop.Platform\n" +def mock_has_cmd(cmd: str) -> Literal[True]: + return True - with ( - patch.object(proc, "has_cmd", return_value=True), - patch.object(proc.subprocess, "check_output", side_effect=flatpak_output), - ): - for client in (FLATPAK_RUN_CMD, FLATPAK_SANDBOX): - with self.subTest(client=client): - self.assertTrue(proc.is_steam_running(client)) - def test_flatpak_not_running(self) -> None: - with patch.object(proc, "has_cmd", return_value=True): - for output in ("", "com.spotify.Client\n", f"{FLATPAK_APPID}Helper\n"): - with ( - self.subTest(output=output), - patch.object(proc.subprocess, "check_output", return_value=output), - ): - self.assertFalse(proc.is_flatpak_steam_running()) +def mock_has_not_cmd(cmd: str) -> Literal[False]: + return False - def test_flatpak_not_installed(self) -> None: - with ( - patch.object(proc, "has_cmd", return_value=False), - patch.object(proc.subprocess, "check_output") as check_output, - ): - self.assertFalse(proc.is_flatpak_steam_running()) - check_output.assert_not_called() - def test_native_steam(self) -> None: - with patch.object(proc, "has_cmd", return_value=True): - for output, expected in ( - ( - [ - [FLATPAK_ROOT_PATH], - "/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper", - ], - True, - ), - ([[FLATPAK_ROOT_PATH]], False), - ([[FLATPAK_ROOT_PATH], ["steam-runtime-launcher-service"]], False), - ([["/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper"]], True), - ( - [ - ["/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper"], - "steam-runtime-launcher-service", - ], - True, - ), - ): - with ( - self.subTest(running=output), - patch.object(proc, "get_steam_procs", return_value=output), - ): - self.assertEqual(proc.is_native_steam_running(), expected) +def mock_get_flatpak_output() -> list[str]: + lines = ["Application", "com.freedesktop.Platform", f"{FLATPAK_APPID}"] + return lines - def test_invalid_client(self) -> None: - with self.assertRaises(TypeError): - proc.is_steam_running("invalid-client") + +@pytest.mark.parametrize( + "output, expected", + [ + ( + [ + [f"/home/user/{FLATPAK_ROOT_PATH}/.local/share/Steam"], + ["/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper"], + ], + True, + ), + ( + [ + [f"/home/user/{FLATPAK_ROOT_PATH}/.local/share/Steam"], + ["steam-runtime-launcher-service"], + ], + False, + ), + ([[f"/home/user/{FLATPAK_ROOT_PATH}/.local/share/Steam"]], False), + ([["/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper"]], True), + ( + [ + ["/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper"], + ["steam-runtime-launcher-service"], + ], + True, + ), + ], +) +def test_native_steam_running( + monkeypatch: "MonkeyPatch", output: list[list[str]], expected: bool +) -> None: + def mock_get_steam_procs() -> list[list[str]]: + return output + + monkeypatch.setattr("dzgui.init.proc.has_cmd", mock_has_cmd) + monkeypatch.setattr("dzgui.init.proc.get_steam_procs", mock_get_steam_procs) + assert proc.is_native_steam_running() == expected + + +def test_flatpak_running(monkeypatch: "MonkeyPatch") -> None: + monkeypatch.setattr("dzgui.init.proc.has_cmd", mock_has_cmd) + monkeypatch.setattr("dzgui.init.proc.get_flatpak_output", mock_get_flatpak_output) + assert proc.is_flatpak_steam_running() + + +def test_flatpak_sandboxed(monkeypatch: "MonkeyPatch") -> None: + monkeypatch.setattr("dzgui.init.proc.has_cmd", mock_has_not_cmd) + monkeypatch.setenv("FLATPAK_ID", FLATPAK_APPID) + assert proc.is_flatpak_steam_running() + + +def test_flatpak_not_installed(monkeypatch: "MonkeyPatch") -> None: + monkeypatch.setattr("dzgui.init.proc.has_cmd", mock_has_not_cmd) + assert not proc.is_flatpak_steam_running() + + +def test_steam_not_installed(monkeypatch: "MonkeyPatch") -> None: + monkeypatch.setattr("dzgui.init.proc.has_cmd", mock_has_not_cmd) + assert not proc.is_native_steam_running() + + +def test_invalid_client() -> None: + with pytest.raises(TypeError): + proc.is_steam_running("invalid-client")