diff --git a/config.json b/config.json index 300dc0e..2ae354e 100644 --- a/config.json +++ b/config.json @@ -1198,8 +1198,8 @@ ] } ], - "page": 24, - "page_name": "24\\nReady" + "page": 21, + "page_name": "21\\nReady" }, "restart_page": { "back_pos": [ diff --git a/ready-page.companionconfig b/ready-page.companionconfig index fc78fa9..795944e 100644 Binary files a/ready-page.companionconfig and b/ready-page.companionconfig differ diff --git a/restart-page.companionconfig b/restart-page.companionconfig index 13282a8..6ab7168 100644 Binary files a/restart-page.companionconfig and b/restart-page.companionconfig differ diff --git a/settings/apply.py b/settings/apply.py index e89b18a..92e9838 100644 --- a/settings/apply.py +++ b/settings/apply.py @@ -455,7 +455,8 @@ class Applier: if want != have: return False, "page %d: the import did not land as built (%d keys built, %d on the page)" % (page, len(want), len(have)) done.append(name) - return True, ", ".join("page %d" % (cfg["page"] if n == "status" else cfg["restart_page"]["page"]) for n in done) or "nothing to import" + number = {"status": cfg["page"], "restart": (cfg.get("restart_page") or {}).get("page"), "ready": (cfg.get("ready_page") or {}).get("page")} + return True, ", ".join("page %s" % number.get(n) for n in done) or "nothing to import" def colour_nav_keys(self, cfg): comp = cfg["companion"] diff --git a/status-page.companionconfig b/status-page.companionconfig index 21e5b9b..3e777f6 100644 Binary files a/status-page.companionconfig and b/status-page.companionconfig differ diff --git a/tests/test_readiness.py b/tests/test_readiness.py index b36a5f8..3a41201 100644 --- a/tests/test_readiness.py +++ b/tests/test_readiness.py @@ -467,12 +467,12 @@ class TestPages(unittest.TestCase): def test_status_page_ready_key_opens_the_page(self): acts = self.actions(make_page.build(CONFIG), 2, 7) - self.assertEqual(acts["up"], [("set_page", {"surfaceId": "self", "page": 24})]) + self.assertEqual(acts["up"], [("set_page", {"surfaceId": "self", "page": 21})]) self.assertEqual(acts["2000"][0][1]["value"], "$(custom:sp_cmd);restart ready $(internal:time_unix)") def test_ready_page(self): export = make_page.build_ready(CONFIG) - self.assertEqual(export["page"]["name"], "24\\nReady") + self.assertEqual(export["page"]["name"], "21\\nReady") self.assertEqual(self.actions(export, 0, 3)["up"][0][1]["value"], "$(custom:sp_cmd);done rd_boh") self.assertNotIn("2000", self.actions(export, 0, 3)) # a tap key has no hold self.assertEqual(self.actions(export, 2, 1)["up"][0][1]["value"], "$(custom:sp_cmd);ack rd_lineup")