mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 12:56:06 +00:00
feat(proton): install experimental Proton builds from a .zip (#2864)
Components > Proton gains an Experimental builds card that installs a Proton build from a .zip, lists it as Experimental-<name> and removes it with its stored and unpacked originals and selections. Replacing a build keeps its user settings and is safe to interrupt. Co-authored-by: maxjivi05 <maxjividen@gmail.com>
This commit is contained in:
1 parent
c35da09d1a
commit
44ade5eeee
43 files changed
+1059
-36
No files matched your search
@@ -2254,6 +2254,87 @@ 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_games_on_a_removed_custom_proton_go_back_to_the_default(self):
|
||||
changes, auto = COMPAT["plan_mapping"](
|
||||
{"0": self.TOOL, "311210": "bo3fix-proton", "42": "GE-Proton11-7"}, ["311210", "42"], self.NAMES, self.TOOL, {},
|
||||
removed={"bo3fix-proton"})
|
||||
self.assertEqual(changes, {"311210": self.TOOL})
|
||||
self.assertEqual(auto, {"311210": self.TOOL})
|
||||
|
||||
def test_removed_tools_are_custom_builds_missing_from_the_catalog(self):
|
||||
state = {"tools": [
|
||||
{"name": self.TOOL, "valve": True},
|
||||
{"name": "bo3fix-proton", "valve": False},
|
||||
{"name": "GE-Proton11-7", "valve": False},
|
||||
]}
|
||||
self.assertEqual(COMPAT["removed_tools"](state, self.CATALOG), {"bo3fix-proton"})
|
||||
self.assertEqual(COMPAT["removed_tools"]({}, self.CATALOG), set())
|
||||
|
||||
def test_a_failed_extra_adoption_is_not_classified_as_removed(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
tools = Path(tmp) / "compatibilitytools.d"
|
||||
tools.mkdir()
|
||||
state = {"tools": [{"name": "GE-Proton11-7", "dir": "GE-Proton11-7", "valve": False}]}
|
||||
(tools / "GE-Proton11-7").mkdir()
|
||||
catalog = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"]
|
||||
self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), set())
|
||||
(tools / "GE-Proton11-7").rmdir()
|
||||
self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), {"GE-Proton11-7"})
|
||||
|
||||
def test_a_build_being_replaced_is_not_classified_as_removed(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
tools = Path(tmp) / "compatibilitytools.d"
|
||||
state = {"tools": [{"name": "GE-Proton11-7", "dir": "GE-Proton11-7", "valve": False}]}
|
||||
catalog = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"]
|
||||
aside = tools / COMPAT["REPLACING"] / "GE-Proton11-7"
|
||||
aside.mkdir(parents=True)
|
||||
self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), set())
|
||||
aside.rmdir()
|
||||
self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), {"GE-Proton11-7"})
|
||||
|
||||
def test_a_request_for_a_removed_tool_is_dropped_and_others_are_kept(self):
|
||||
state = {"tools": self.CATALOG, "games_applied": {}}
|
||||
requests = {"10": {"valve": False, "dir": "GE-Proton11-7"}, "11": {"valve": False, "dir": "Never-Installed"},
|
||||
"12": {"valve": True, "dir": "GE-Proton11-7"}}
|
||||
catalog = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"]
|
||||
settled, moved = COMPAT["settle_game_requests"](requests, state, {}, catalog, removed={"GE-Proton11-7"})
|
||||
self.assertTrue(moved)
|
||||
self.assertEqual(settled, {"11": requests["11"], "12": requests["12"]})
|
||||
self.assertEqual(COMPAT["settle_game_requests"](requests, state, {}, catalog), (requests, False))
|
||||
malformed = {"10": {"valve": False, "dir": []}}
|
||||
self.assertEqual(COMPAT["settle_game_requests"](malformed, state, {}, catalog, removed={"GE-Proton11-7"}), (malformed, False))
|
||||
|
||||
def test_a_game_on_a_removed_tool_follows_the_default_across_registrations(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
config = Path(tmp) / "config.vdf"
|
||||
config.write_text(config_text([("0", self.TOOL), ("10", "GE-Proton11-7"), ("11", "GE-Proton11-7")]))
|
||||
request = {"valve": False, "dir": "GE-Proton11-7"}
|
||||
available = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"]
|
||||
(Path(tmp) / "games.json").write_text(json.dumps({"version": 1, "games": {"10": request}}))
|
||||
(Path(tmp) / "state.json").write_text(json.dumps({
|
||||
"default": self.TOOL,
|
||||
"tools": self.CATALOG,
|
||||
}))
|
||||
for default in (self.TOOL, self.TOOL, COMPAT["TOOL_11"]):
|
||||
COMPAT["register_default"](
|
||||
str(config), ["10", "11"], default=default, catalog=available,
|
||||
directory=tmp,
|
||||
)
|
||||
self.assertEqual(mapping_of(config.read_text()),
|
||||
{"0": COMPAT["TOOL_11"], "10": COMPAT["TOOL_11"], "11": COMPAT["TOOL_11"]})
|
||||
self.assertEqual(json.loads((Path(tmp) / "games.json").read_text())["games"], {})
|
||||
|
||||
def test_a_steam_pick_survives_the_removal_of_another_tool(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
config = Path(tmp) / "config.vdf"
|
||||
config.write_text(config_text([("0", self.TOOL), ("10", COMPAT["TOOL_11"])]))
|
||||
available = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"]
|
||||
(Path(tmp) / "games.json").write_text(json.dumps(
|
||||
{"version": 1, "games": {"10": {"valve": False, "dir": "GE-Proton11-7"}}}))
|
||||
(Path(tmp) / "state.json").write_text(json.dumps({"default": self.TOOL, "tools": self.CATALOG, "auto": {}}))
|
||||
COMPAT["register_default"](str(config), ["10"], default=self.TOOL, catalog=available, directory=tmp)
|
||||
self.assertEqual(mapping_of(config.read_text()), {"0": self.TOOL, "10": COMPAT["TOOL_11"]})
|
||||
|
||||
def test_windows_only_titles_still_follow_the_default(self):
|
||||
changes, auto = COMPAT["plan_mapping"](
|
||||
{"0": self.TOOL}, ["42"], self.NAMES, self.TOOL, {})
|
||||
@@ -2597,6 +2678,41 @@ class ProtonDefaultTest(unittest.TestCase):
|
||||
"11": COMPAT["TOOL_11"],
|
||||
})
|
||||
|
||||
def test_per_game_proton_that_was_removed_goes_back_to_the_default(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
config = Path(tmp) / "config.vdf"
|
||||
config.write_text(config_text([
|
||||
("0", self.TOOL),
|
||||
("10", "Experimental-DroidDeck-Proton-11-12.8-pr34-build"),
|
||||
("12", "GE-Proton9-1"),
|
||||
]))
|
||||
(Path(tmp) / "games.json").write_text(json.dumps({
|
||||
"version": 1,
|
||||
"games": {
|
||||
"10": {"valve": False, "dir": "Experimental-DroidDeck-Proton-11-12.8-pr34-build"},
|
||||
"12": {"valve": False, "dir": "GE-Proton9-1"},
|
||||
},
|
||||
}))
|
||||
(Path(tmp) / "state.json").write_text(json.dumps({
|
||||
"default": self.TOOL,
|
||||
"tools": self.CATALOG + [{
|
||||
"name": "Experimental-DroidDeck-Proton-11-12.8-pr34-build",
|
||||
"display": "Experimental-DroidDeck-Proton-11-12.8-pr34-build",
|
||||
"dir": "Experimental-DroidDeck-Proton-11-12.8-pr34-build", "valve": False,
|
||||
}],
|
||||
}))
|
||||
|
||||
COMPAT["register_default"](
|
||||
str(config), ["10", "12"], default=self.TOOL,
|
||||
catalog=self.CATALOG, directory=tmp,
|
||||
)
|
||||
|
||||
self.assertEqual(mapping_of(config.read_text()), {
|
||||
"0": self.TOOL,
|
||||
"10": self.TOOL,
|
||||
"12": "GE-Proton9-1",
|
||||
})
|
||||
|
||||
def test_the_last_side_to_change_wins(self):
|
||||
state = {"default": self.TOOL, "applied": 5}
|
||||
default, state = COMPAT["choose_default"]("GE-Proton11-7", state, {"seq": 5, "dir": "Proton 11.0 (ARM64)", "valve": True}, self.CATALOG, now=100)
|
||||
|
||||
Reference in new issue
Block a user