christian/ThePirateRay
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fail closed when Rayforge runtime is missing

Browse source
This commit is contained in:
Codex 2026-10-19 19:55:02 +02:00
parent 583540a90c
commit 5945bb0b61
2 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
scripts/check_rayforge_windows_gui.py
View file

@ -11,21 +11,25 @@ from pathlib import Path
def inspect(rayforge: Path, python_env: Path) -> dict[str, object]: def inspect(rayforge: Path, python_env: Path) -> dict[str, object]:
msys2_shell = Path("C:/msys64/msys2_shell.cmd") msys2_shell = Path("C:/msys64/msys2_shell.cmd")
msys2_env = rayforge / ".msys2_env" msys2_env = rayforge / ".msys2_env"
gi_probe = subprocess.run( if python_env.is_file():
[str(python_env), "-c", "import gi"], gi_probe = subprocess.run(
capture_output=True, [str(python_env), "-c", "import gi"],
text=True, capture_output=True,
check=False, text=True,
) check=False,
gi_available = gi_probe.returncode == 0 )
gi_error = next( gi_available = gi_probe.returncode == 0
( gi_error = next(
line.strip() (
for line in reversed(gi_probe.stderr.splitlines()) line.strip()
if line.strip() for line in reversed(gi_probe.stderr.splitlines())
), if line.strip()
"unable to import gi", ),
) "unable to import gi",
)
else:
gi_available = False
gi_error = "python runtime not found"
app_entry = rayforge / "rayforge" / "__main__.py" app_entry = rayforge / "rayforge" / "__main__.py"
addon_manifest = ( addon_manifest = (
Path(__file__).parents[1] Path(__file__).parents[1]

9
tests/test_rayforge_windows_gui_preflight.py
View file

@ -1,6 +1,9 @@
import json import json
import unittest import unittest
from pathlib import Path from pathlib import Path
import tempfile
from scripts.check_rayforge_windows_gui import inspect
ROOT = Path(__file__).parents[1] ROOT = Path(__file__).parents[1]
@ -30,6 +33,12 @@ class RayforgeWindowsGuiPreflightTests(unittest.TestCase):
def test_result_records_the_requested_runtime_probe(self): def test_result_records_the_requested_runtime_probe(self):
self.assertIn("No module named 'gi'", self.result["observed_launch_error"]) self.assertIn("No module named 'gi'", self.result["observed_launch_error"])
def test_missing_runtime_path_fails_closed(self):
with tempfile.TemporaryDirectory() as temporary:
result = inspect(Path(temporary), Path(temporary) / "missing-python.exe")
self.assertFalse(result["ready_for_manual_gui_test"])
self.assertEqual("python runtime not found", result["observed_launch_error"])
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()