mirror of
https://github.com/aclist/dztui.git
synced 2026-11-22 09:29:31 +01:00
Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cdfe59ce38 | ||
|
|
3f74e71a10 | ||
|
|
533a77da23 | ||
|
|
b98172e782 | ||
|
|
5febda79ca | ||
|
|
dee566932a | ||
|
|
00741b0b60 | ||
|
|
0f28885e7b | ||
|
|
dfef2cfd75 | ||
|
|
d47d7075e9 | ||
|
|
ea41503dad | ||
|
|
d2208787b4 | ||
|
|
77682cacd4 | ||
|
|
e8d7d9eb15 |
No files matched your search
@@ -23,7 +23,7 @@ def has_flatpak_client() -> bool:
|
|||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.critical(e)
|
logger.debug(e)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -347,7 +347,9 @@ thanks = Thanks(
|
|||||||
"scandalouss",
|
"scandalouss",
|
||||||
"SnackSBR",
|
"SnackSBR",
|
||||||
"StevelDusa",
|
"StevelDusa",
|
||||||
|
"sylvaingirardbe",
|
||||||
"Thoughtduck216",
|
"Thoughtduck216",
|
||||||
|
"u-alexandru",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ from dzgui.views.components.buttons import ClipboardButton
|
|||||||
from dzgui.views.mixins.colorscheme import ColorAwareApp
|
from dzgui.views.mixins.colorscheme import ColorAwareApp
|
||||||
|
|
||||||
gi.require_version("Gtk", "3.0")
|
gi.require_version("Gtk", "3.0")
|
||||||
from gi.repository import Gtk, GLib, Gdk
|
from gi.repository import Gtk, GLib, Gdk, Pango
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from dzgui.config.xdg import Xdg
|
from dzgui.config.xdg import Xdg
|
||||||
@@ -95,7 +95,7 @@ class BootDialog(ColorAwareApp, Gtk.Dialog): # type: ignore
|
|||||||
margin_top=30,
|
margin_top=30,
|
||||||
margin_bottom=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
|
# TODO: abstract class
|
||||||
self.copy_button = ClipboardButton(self.error_label.get_text)
|
self.copy_button = ClipboardButton(self.error_label.get_text)
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import tomllib
|
import tomllib
|
||||||
from shared import get_git_root
|
from shared import get_git_root
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
|
||||||
def get_entrypoint() -> None:
|
def get_entrypoint() -> Any:
|
||||||
root = get_git_root()
|
root = get_git_root()
|
||||||
p = root.joinpath("pyproject.toml")
|
p = root.joinpath("pyproject.toml")
|
||||||
with open(p, "rb") as f:
|
with open(p, "rb") as f:
|
||||||
|
|||||||
+3
-3
@@ -52,7 +52,7 @@ def untar(file: str, glob: str, renamed: str) -> None:
|
|||||||
os.rename(_dir, build_dir.joinpath(renamed))
|
os.rename(_dir, build_dir.joinpath(renamed))
|
||||||
|
|
||||||
|
|
||||||
def install_deps() -> None:
|
def install_deps() -> int:
|
||||||
pip = build_dir.joinpath(f"{CPYTHON_BUILD}/bin/pip")
|
pip = build_dir.joinpath(f"{CPYTHON_BUILD}/bin/pip")
|
||||||
proc = subprocess.run([pip, "install", root])
|
proc = subprocess.run([pip, "install", root])
|
||||||
return proc.returncode
|
return proc.returncode
|
||||||
@@ -65,12 +65,12 @@ def repackage() -> None:
|
|||||||
tar.add(build_dir.joinpath(CPYTHON_BUILD), arcname="python")
|
tar.add(build_dir.joinpath(CPYTHON_BUILD), arcname="python")
|
||||||
|
|
||||||
|
|
||||||
def rebuild_cpython() -> None:
|
def rebuild_cpython() -> str:
|
||||||
if cpython_dir.is_dir() is False:
|
if cpython_dir.is_dir() is False:
|
||||||
get_cpython()
|
get_cpython()
|
||||||
code = install_deps()
|
code = install_deps()
|
||||||
if code != 0:
|
if code != 0:
|
||||||
return
|
return ""
|
||||||
repackage()
|
repackage()
|
||||||
return get_packaged_version()
|
return get_packaged_version()
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -92,8 +92,8 @@ with tarfile.open(tarpath, "w:gz") as tar:
|
|||||||
tar.add(subfolder, arcname=appname, filter=update_uname)
|
tar.add(subfolder, arcname=appname, filter=update_uname)
|
||||||
print(f"Wrote tarfile to '{tarpath}'")
|
print(f"Wrote tarfile to '{tarpath}'")
|
||||||
|
|
||||||
proc = subprocess.run([release_exe, "-v"], capture_output=True, text=True)
|
built_proc = subprocess.run([release_exe, "-v"], capture_output=True, text=True)
|
||||||
assert proc.stdout.rstrip() == version
|
assert str(built_proc.stdout).rstrip() == version
|
||||||
|
|
||||||
# TODO: clean up staging directory
|
# TODO: clean up staging directory
|
||||||
release_exe.unlink()
|
release_exe.unlink()
|
||||||
|
|||||||
@@ -8,7 +8,13 @@ def get_image_path() -> Path:
|
|||||||
return get_git_root().joinpath("dzgui/data/images/example.png")
|
return get_git_root().joinpath("dzgui/data/images/example.png")
|
||||||
|
|
||||||
|
|
||||||
|
def take_screenshot() -> None:
|
||||||
p = get_image_path()
|
p = get_image_path()
|
||||||
app = build_gui("", False)
|
app = build_gui("", False)
|
||||||
|
if app is None:
|
||||||
|
return
|
||||||
app.set_automation_param("screenshot_path", p)
|
app.set_automation_param("screenshot_path", p)
|
||||||
app.run(None)
|
app.run(None)
|
||||||
|
|
||||||
|
|
||||||
|
take_screenshot()
|
||||||
+5
-10
@@ -3,14 +3,9 @@ import subprocess
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
cmd = ["git", "ls-files", "--others", "--exclude-standard"]
|
cmd = ["git", "ls-files", "--others", "--exclude-standard"]
|
||||||
result = subprocess.Popen(
|
result = subprocess.run(cmd, capture_output=True, text=True)
|
||||||
cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
|
untracked = [os.path.basename(line.rstrip()) for line in result.stdout.splitlines()]
|
||||||
)
|
if bool(untracked):
|
||||||
with open(".gitignore", "r") as f:
|
print("The following files are untracked. Add to .gitignore if this is intended.")
|
||||||
ignored = [line.rstrip() for line in f]
|
print("\n".join(untracked))
|
||||||
|
|
||||||
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)
|
sys.exit(1)
|
||||||
@@ -1,80 +1,93 @@
|
|||||||
import pytest
|
import pytest
|
||||||
import unittest
|
|
||||||
|
|
||||||
from unittest.mock import patch
|
from typing import Literal, TYPE_CHECKING
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
from dzgui.const.constants import (
|
from dzgui.const.constants import (
|
||||||
FLATPAK_APPID,
|
FLATPAK_APPID,
|
||||||
FLATPAK_ROOT_PATH,
|
FLATPAK_ROOT_PATH,
|
||||||
FLATPAK_RUN_CMD,
|
|
||||||
FLATPAK_SANDBOX,
|
|
||||||
)
|
)
|
||||||
from dzgui.init import proc
|
from dzgui.init import proc
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from _pytest.monkeypatch import MonkeyPatch
|
||||||
|
|
||||||
pytestmark = pytest.mark.flatpak
|
pytestmark = pytest.mark.flatpak
|
||||||
|
|
||||||
|
|
||||||
class TestSteamDetection(unittest.TestCase):
|
def mock_has_cmd(cmd: str) -> Literal[True]:
|
||||||
def test_flatpak_detection_with_multiple_running_apps(self) -> None:
|
return True
|
||||||
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"
|
|
||||||
|
|
||||||
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:
|
def mock_has_not_cmd(cmd: str) -> Literal[False]:
|
||||||
with patch.object(proc, "has_cmd", return_value=True):
|
return False
|
||||||
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 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:
|
def mock_get_flatpak_output() -> list[str]:
|
||||||
with patch.object(proc, "has_cmd", return_value=True):
|
lines = ["Application", "com.freedesktop.Platform", f"{FLATPAK_APPID}"]
|
||||||
for output, expected in (
|
return lines
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"output, expected",
|
||||||
|
[
|
||||||
(
|
(
|
||||||
[
|
[
|
||||||
[FLATPAK_ROOT_PATH],
|
[f"/home/user/{FLATPAK_ROOT_PATH}/.local/share/Steam"],
|
||||||
"/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper",
|
["/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper"],
|
||||||
],
|
],
|
||||||
True,
|
True,
|
||||||
),
|
),
|
||||||
([[FLATPAK_ROOT_PATH]], False),
|
(
|
||||||
([[FLATPAK_ROOT_PATH], ["steam-runtime-launcher-service"]], False),
|
[
|
||||||
|
[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"]], True),
|
||||||
(
|
(
|
||||||
[
|
[
|
||||||
["/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper"],
|
["/home/user/.local/share/Steam/ubuntu12_64/steamwebhelper"],
|
||||||
"steam-runtime-launcher-service",
|
["steam-runtime-launcher-service"],
|
||||||
],
|
],
|
||||||
True,
|
True,
|
||||||
),
|
),
|
||||||
):
|
],
|
||||||
with (
|
)
|
||||||
self.subTest(running=output),
|
def test_native_steam_running(
|
||||||
patch.object(proc, "get_steam_procs", return_value=output),
|
monkeypatch: "MonkeyPatch", output: list[list[str]], expected: bool
|
||||||
):
|
) -> None:
|
||||||
self.assertEqual(proc.is_native_steam_running(), expected)
|
def mock_get_steam_procs() -> list[list[str]]:
|
||||||
|
return output
|
||||||
|
|
||||||
def test_invalid_client(self) -> None:
|
monkeypatch.setattr("dzgui.init.proc.has_cmd", mock_has_cmd)
|
||||||
with self.assertRaises(TypeError):
|
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")
|
proc.is_steam_running("invalid-client")
|
||||||
Reference in new issue
Block a user