From 7b8e29b6ce637bd79a6e0fc7c0f9ee92120d441d Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 19 Jul 2023 13:06:43 -0700 Subject: [PATCH] Fix typo in local system GUI page resolution with unit test --- ovos_gui/page.py | 3 ++- test/unittests/test_page.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ovos_gui/page.py b/ovos_gui/page.py index 8ac35a4..9ec77ce 100644 --- a/ovos_gui/page.py +++ b/ovos_gui/page.py @@ -76,7 +76,8 @@ def get_uri(self, framework: str = "qt5", server_url: str = None) -> str: if isfile(file_path): return file_path # Check system resources - file_path = join(dirname(__file__), "res", "gui", framework) + file_path = join(dirname(__file__), "res", "gui", framework, + res_filename) if isfile(file_path): return file_path raise FileNotFoundError(f"Unable to resolve resource file for " diff --git a/test/unittests/test_page.py b/test/unittests/test_page.py index 12624de..366c923 100644 --- a/test/unittests/test_page.py +++ b/test/unittests/test_page.py @@ -59,6 +59,12 @@ def test_gui_page_from_local_path(self): qt6 = qt6_page.get_uri("qt6") self.assertTrue(isfile(qt6)) + # System page + system_page = GuiPage(None, "SYSTEM_ImageFrame", False, 30, + "SYSTEM_ImageFrame", namespace, res_dirs) + qt5 = system_page.get_uri("qt5") + self.assertTrue(isfile(qt5)) + # Legacy GUI File organization res_dirs = {"qt5": join(dirname(__file__), "mock_data", "gui", "qt5"), "qt6": join(dirname(__file__), "mock_data", "gui", "qt6")}