mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 05:46:03 +00:00
Preserve native Linux and FEX compatibility choices (#749)
This commit is contained in:
1 parent
0c3444afbc
commit
06b09b37bd
5 files changed
+533
-25
No files matched your search
@@ -26,6 +26,22 @@ def config_text(entries):
|
||||
return '"InstallConfigStore" { "Software" { "Valve" { "Steam" { "CompatToolMapping" { %s } } } } }' % mapping
|
||||
|
||||
|
||||
class ReadConfigMappingTest(unittest.TestCase):
|
||||
def test_missing_parent_or_unbalanced_vdf_is_not_treated_as_absent_choices(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
config = Path(tmp) / "config.vdf"
|
||||
config.write_text('"InstallConfigStore" { "Software" { "Other" {} } }')
|
||||
self.assertIsNone(COMPAT["read_config_mapping"](str(config)))
|
||||
config.write_text('"InstallConfigStore" { "Software" { "Valve" { "Steam" {} }')
|
||||
self.assertIsNone(COMPAT["read_config_mapping"](str(config)))
|
||||
|
||||
def test_valid_steam_parent_without_compat_mapping_has_no_per_app_choices(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
config = Path(tmp) / "config.vdf"
|
||||
config.write_text('"InstallConfigStore" { "Software" { "Valve" { "Steam" {} } } }')
|
||||
self.assertEqual(COMPAT["read_config_mapping"](str(config)), {})
|
||||
|
||||
|
||||
class GameEnvironmentTest(unittest.TestCase):
|
||||
def test_the_install_script_evaluator_gets_its_scripts_marked_first(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
@@ -415,6 +431,218 @@ class ProtonDefaultTest(unittest.TestCase):
|
||||
self.assertEqual(changes, {"0": "GE-Proton11-7", "10": "GE-Proton11-7", "11": "GE-Proton11-7", "14": "GE-Proton11-7"})
|
||||
self.assertEqual(auto, {"10": "GE-Proton11-7", "11": "GE-Proton11-7", "14": "GE-Proton11-7"})
|
||||
|
||||
def test_windows_only_titles_still_follow_the_default(self):
|
||||
changes, auto = COMPAT["plan_mapping"](
|
||||
{"0": self.TOOL}, ["42"], self.NAMES, self.TOOL, {})
|
||||
self.assertEqual(changes, {"42": self.TOOL})
|
||||
self.assertEqual(auto, {"42": self.TOOL})
|
||||
|
||||
def test_native_arm64_default_clears_only_our_auto_mapping(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
config = Path(tmp) / "config.vdf"
|
||||
config.write_text(config_text([("0", self.TOOL), ("42", self.TOOL)]))
|
||||
(Path(tmp) / "state.json").write_text(json.dumps({
|
||||
"default": self.TOOL,
|
||||
"auto": {"42": self.TOOL},
|
||||
}))
|
||||
globals_ = COMPAT["register_default"].__globals__
|
||||
original_native_targets = globals_["native_targets"]
|
||||
globals_["native_targets"] = lambda _root, _apps: {"42": None}
|
||||
try:
|
||||
COMPAT["register_default"](
|
||||
str(config), ["42"], catalog=self.CATALOG, directory=tmp)
|
||||
first = config.read_bytes()
|
||||
self.assertEqual(mapping_of(first.decode()), {"0": self.TOOL})
|
||||
self.assertEqual(COMPAT["tokenize"](first.decode()),
|
||||
COMPAT["tokenize"](config_text([("0", self.TOOL)])))
|
||||
self.assertEqual(json.loads((Path(tmp) / "state.json").read_text())["auto"], {})
|
||||
|
||||
COMPAT["register_default"](
|
||||
str(config), ["42"], catalog=self.CATALOG, directory=tmp)
|
||||
self.assertEqual(config.read_bytes(), first)
|
||||
finally:
|
||||
globals_["native_targets"] = original_native_targets
|
||||
|
||||
def test_saved_native_choice_survives_valve_pick_without_appinfo(self):
|
||||
app = "452280"
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
root = Path(tmp)
|
||||
steam = root / "Steam"
|
||||
config = steam / "config/config.vdf"
|
||||
config.parent.mkdir(parents=True)
|
||||
(steam / "steamapps").mkdir()
|
||||
(steam / "steamapps" / ("appmanifest_%s.acf" % app)).write_text("")
|
||||
config.write_text(config_text([("0", self.TOOL)]))
|
||||
(root / "state.json").write_text(json.dumps({
|
||||
"default": self.TOOL,
|
||||
"auto": {},
|
||||
"native": [app],
|
||||
}))
|
||||
|
||||
globals_ = COMPAT["register_default"].__globals__
|
||||
original_native_targets = globals_["native_targets"]
|
||||
globals_["native_targets"] = lambda _root, _apps: {}
|
||||
try:
|
||||
COMPAT["register_default"](
|
||||
str(config), [], catalog=self.CATALOG, directory=tmp, picks=[app])
|
||||
self.assertEqual(mapping_of(config.read_text()), {"0": self.TOOL})
|
||||
state = json.loads((root / "state.json").read_text())
|
||||
self.assertEqual(state["auto"], {})
|
||||
self.assertEqual(state["native"], [app])
|
||||
finally:
|
||||
globals_["native_targets"] = original_native_targets
|
||||
|
||||
def test_shortcuts_scanner_keeps_native_choice_for_unrelated_app_list(self):
|
||||
app, added_shortcut = "452280", "3537741571"
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
root = Path(tmp)
|
||||
steam = root / "Steam"
|
||||
config = steam / "config/config.vdf"
|
||||
config.parent.mkdir(parents=True)
|
||||
(steam / "steamapps").mkdir()
|
||||
(steam / "steamapps" / ("appmanifest_%s.acf" % app)).write_text("")
|
||||
config.write_text(config_text([("0", self.TOOL)]))
|
||||
(root / "state.json").write_text(json.dumps({
|
||||
"default": self.TOOL,
|
||||
"auto": {},
|
||||
"native": [app],
|
||||
}))
|
||||
|
||||
globals_ = COMPAT["register_default"].__globals__
|
||||
original_native_targets = globals_["native_targets"]
|
||||
globals_["native_targets"] = lambda _root, wanted: {
|
||||
app: COMPAT["NATIVE_CHOICE"]
|
||||
} if app in wanted else {}
|
||||
try:
|
||||
COMPAT["register_default"](
|
||||
str(config), [app], catalog=self.CATALOG, directory=tmp)
|
||||
self.assertEqual(json.loads((root / "state.json").read_text())["native"], [app])
|
||||
|
||||
COMPAT["register_default"](
|
||||
str(config), [added_shortcut], catalog=self.CATALOG, directory=tmp)
|
||||
state = json.loads((root / "state.json").read_text())
|
||||
self.assertEqual(state["native"], [app])
|
||||
self.assertEqual(state["auto"], {added_shortcut: self.TOOL})
|
||||
self.assertEqual(mapping_of(config.read_text()), {
|
||||
"0": self.TOOL,
|
||||
added_shortcut: self.TOOL,
|
||||
})
|
||||
finally:
|
||||
globals_["native_targets"] = original_native_targets
|
||||
|
||||
def test_factorio_preserves_an_observed_native_choice_despite_ambiguous_metadata(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
steam = Path(tmp) / "Steam"
|
||||
config = steam / "config/config.vdf"
|
||||
config.parent.mkdir(parents=True)
|
||||
config.write_text(config_text([("0", self.TOOL)]))
|
||||
state = {"default": self.TOOL, "auto": {}}
|
||||
(Path(tmp) / "state.json").write_text(json.dumps(state))
|
||||
|
||||
globals_ = COMPAT["native_targets"].__globals__
|
||||
original_platforms = globals_["appinfo_platforms"]
|
||||
globals_["appinfo_platforms"] = lambda _path, wanted: {
|
||||
"427520": ({"linux", "macos", "windows"}, "", "game")
|
||||
} if "427520" in wanted else {}
|
||||
try:
|
||||
native = COMPAT["native_targets"](str(steam), ["427520"])
|
||||
self.assertIs(native["427520"], COMPAT["NATIVE_CHOICE"])
|
||||
|
||||
changes, auto = COMPAT["plan_mapping"](
|
||||
{"0": self.TOOL}, ["427520"], self.NAMES, self.TOOL, {}, native)
|
||||
self.assertEqual(changes, {"427520": self.TOOL})
|
||||
self.assertEqual(auto, {"427520": self.TOOL})
|
||||
|
||||
COMPAT["register_default"](
|
||||
str(config), ["427520"], catalog=self.CATALOG, directory=tmp)
|
||||
self.assertEqual(mapping_of(config.read_text()), {"0": self.TOOL, "427520": self.TOOL})
|
||||
|
||||
state["auto"] = {"427520": self.TOOL}
|
||||
(Path(tmp) / "state.json").write_text(json.dumps(state))
|
||||
config.write_text(config_text([("0", self.TOOL)]))
|
||||
COMPAT["register_default"](
|
||||
str(config), ["427520"], catalog=self.CATALOG, directory=tmp)
|
||||
first = config.read_bytes()
|
||||
self.assertEqual(mapping_of(first.decode()), {"0": self.TOOL})
|
||||
self.assertEqual(COMPAT["tokenize"](first.decode()),
|
||||
COMPAT["tokenize"](config_text([("0", self.TOOL)])))
|
||||
self.assertEqual(json.loads((Path(tmp) / "state.json").read_text())["auto"], {})
|
||||
self.assertEqual(json.loads((Path(tmp) / "state.json").read_text())["native"], ["427520"])
|
||||
|
||||
COMPAT["register_default"](
|
||||
str(config), ["427520"], catalog=self.CATALOG, directory=tmp)
|
||||
self.assertEqual(config.read_bytes(), first)
|
||||
|
||||
config.write_text(config_text([("0", self.TOOL), ("427520", "")]))
|
||||
COMPAT["register_default"](
|
||||
str(config), ["427520"], catalog=self.CATALOG, directory=tmp)
|
||||
native_choice = config.read_bytes()
|
||||
self.assertEqual(mapping_of(native_choice.decode()), {"0": self.TOOL, "427520": ""})
|
||||
self.assertEqual(json.loads((Path(tmp) / "state.json").read_text())["auto"], {})
|
||||
self.assertEqual(json.loads((Path(tmp) / "state.json").read_text())["native"], ["427520"])
|
||||
COMPAT["register_default"](
|
||||
str(config), ["427520"], catalog=self.CATALOG, directory=tmp)
|
||||
self.assertEqual(config.read_bytes(), native_choice)
|
||||
|
||||
for choice in (COMPAT["FEX_TOOL"], COMPAT["TOOL_11"], "GE-Proton11-7"):
|
||||
config.write_text(config_text([("0", self.TOOL), ("427520", choice)]))
|
||||
COMPAT["register_default"](
|
||||
str(config), ["427520"], catalog=self.CATALOG, directory=tmp)
|
||||
self.assertEqual(mapping_of(config.read_text()), {"0": self.TOOL, "427520": choice})
|
||||
self.assertEqual(json.loads((Path(tmp) / "state.json").read_text())["native"], [])
|
||||
|
||||
state = json.loads((Path(tmp) / "state.json").read_text())
|
||||
state["native"] = ["427520"]
|
||||
state["auto"] = {}
|
||||
(Path(tmp) / "state.json").write_text(json.dumps(state))
|
||||
config.write_text(config_text([("0", self.TOOL), ("427520", "proton_experimental")]))
|
||||
COMPAT["register_default"](
|
||||
str(config), ["427520"], catalog=self.CATALOG, directory=tmp)
|
||||
self.assertEqual(mapping_of(config.read_text()), {"0": self.TOOL, "427520": self.TOOL})
|
||||
saved = json.loads((Path(tmp) / "state.json").read_text())
|
||||
self.assertEqual(saved["native"], [])
|
||||
self.assertEqual(saved["auto"], {"427520": self.TOOL})
|
||||
finally:
|
||||
globals_["appinfo_platforms"] = original_platforms
|
||||
|
||||
def test_native_arm64_preserves_a_proton_mapping_without_managed_state(self):
|
||||
changes, auto = COMPAT["plan_mapping"](
|
||||
{"0": self.TOOL, "42": self.TOOL}, ["42"], self.NAMES, self.TOOL,
|
||||
{"42": self.TOOL}, {"42": None}, managed=())
|
||||
self.assertEqual(changes, {})
|
||||
self.assertEqual(auto, {})
|
||||
|
||||
def test_native_arm64_keeps_a_chosen_valve_proton_through_its_wrapper(self):
|
||||
changes, auto = COMPAT["plan_mapping"](
|
||||
{"0": self.TOOL, "42": "proton_experimental"}, ["42"], self.NAMES,
|
||||
self.TOOL, {}, {"42": None})
|
||||
self.assertEqual(changes, {"42": self.TOOL})
|
||||
self.assertEqual(auto, {})
|
||||
|
||||
changes, auto = COMPAT["plan_mapping"](
|
||||
{"0": self.TOOL, "42": self.TOOL}, ["42"], self.NAMES,
|
||||
self.TOOL, {}, {"42": None})
|
||||
self.assertEqual(changes, {})
|
||||
self.assertEqual(auto, {})
|
||||
|
||||
def test_native_arm64_keeps_explicit_runtime_fex_and_proton_profiles(self):
|
||||
fex = COMPAT["FEX_TOOL"]
|
||||
current = {
|
||||
"0": self.TOOL,
|
||||
"42": COMPAT["TOOL_11"],
|
||||
"43": "GE-Proton11-7",
|
||||
"44": "steamlinuxruntime_arm64",
|
||||
"45": fex,
|
||||
"46": "",
|
||||
}
|
||||
changes, auto = COMPAT["plan_mapping"](
|
||||
current, ["42", "43", "44", "45", "46"], self.NAMES, self.TOOL, {},
|
||||
{app: None for app in ("42", "43", "44", "45", "46")},
|
||||
overrides={"46": "GE-Proton11-7"},
|
||||
)
|
||||
self.assertEqual(changes, {"46": "GE-Proton11-7"})
|
||||
self.assertEqual(auto, {})
|
||||
|
||||
def test_titles_following_the_default_move_with_it_and_picks_stay(self):
|
||||
current = {"0": self.TOOL, "10": self.TOOL, "11": "GE-Proton11-7", "12": self.TOOL}
|
||||
auto = {"10": self.TOOL, "11": self.TOOL, "12": self.TOOL}
|
||||
|
||||
Reference in new issue
Block a user