From 31cead9b32ee76cb1102997f399e681ecd389912 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 03:17:44 -0400 Subject: [PATCH] fix: keep blank lines inside the overlay section and stage settings under a unique name --- .../overlay/usr/local/bin/droiddeck-game-env | 19 ++++++++++++++----- tools/tests/test_game_environment.py | 6 ++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 4d453b380..8271b6551 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -6,6 +6,7 @@ import re import runpy import subprocess import sys +import tempfile from pathlib import Path GAME_TU_DEBUG = "DROIDDECK_GAME_TU_DEBUG" @@ -161,8 +162,11 @@ def overlay_off(text): lines.pop() return "\n".join(lines + ["overlay:", " enabled: false", " warning_enabled: false"]) + "\n" end = start + 1 - while end < len(lines) and lines[end].startswith(" "): - end += 1 + for index in range(start + 1, len(lines)): + if lines[index].strip() and not lines[index].startswith(" "): + break + if lines[index].strip(): + end = index + 1 block = lines[start + 1:end] for key in ("enabled", "warning_enabled"): entry = " %s: false" % key @@ -185,9 +189,14 @@ def ubisoft_overlay_off(env): if updated == text: return settings.parent.mkdir(parents=True, exist_ok=True) - staged = settings.with_name(settings.name + ".tmp") - staged.write_text(updated, encoding="utf-8") - staged.replace(settings) + handle, staged = tempfile.mkstemp(prefix=".settings-", dir=settings.parent) + try: + with os.fdopen(handle, "w", encoding="utf-8") as target: + target.write(updated) + os.replace(staged, settings) + except BaseException: + os.unlink(staged) + raise print("droiddeck-game-env: Ubisoft Connect overlay turned off", file=sys.stderr) except (OSError, UnicodeDecodeError) as error: print("droiddeck-game-env: Ubisoft Connect overlay left as is (%s)" % error, file=sys.stderr) diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 2841ddf9e..b936556e5 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1233,6 +1233,12 @@ class UbisoftOverlayTest(unittest.TestCase): "overlay:\n fps_enabled: true\n enabled: false\n warning_enabled: false\nmisc:\n a: 1\n") self.assertEqual(MODULE["overlay_off"](""), "overlay:\n enabled: false\n warning_enabled: false\n") + def test_blank_lines_inside_the_overlay_section_do_not_end_it(self): + text = "overlay:\n enabled: true\n\n warning_enabled: true\n\nmisc:\n a: 1\n" + self.assertEqual(MODULE["overlay_off"](text), text.replace("true", "false")) + self.assertEqual(MODULE["overlay_off"]("overlay:\n fps_enabled: true\n\nmisc:\n a: 1\n"), + "overlay:\n fps_enabled: true\n enabled: false\n warning_enabled: false\n\nmisc:\n a: 1\n") + def test_only_prefixes_with_ubisoft_connect_are_touched(self): with tempfile.TemporaryDirectory() as tmp: prefix = Path(tmp) / "447040/pfx"