From 311ec461ed08e36e0e4c434c138f21e1ec24f9de Mon Sep 17 00:00:00 2001 From: miro Date: Wed, 18 Sep 2024 23:46:28 +0100 Subject: [PATCH] refactor!:deprecate QML upload from bus never worked right, causes more issues than it helps --- ovos_gui/page.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ovos_gui/page.py b/ovos_gui/page.py index de1e24e..2121d86 100644 --- a/ovos_gui/page.py +++ b/ovos_gui/page.py @@ -45,10 +45,6 @@ def get_file_extension(framework: str) -> str: return "qml" return "" - @property - def _gui_cache(self): - return f"{GUI_CACHE_PATH}]/{self.res_namespace}" - @property def res_namespace(self): return "system" if self.page_id.startswith("SYSTEM") else self.namespace @@ -64,10 +60,7 @@ def get_uri(self, framework: str = "qt5") -> str: return self.url res_filename = f"{self.page_id}.{self.get_file_extension(framework)}" - if self.res_namespace == "system": - path = join(dirname(__file__), "res", "gui", framework, res_filename) - else: - path = f"{self._gui_cache}/{framework}/{res_filename}" + path = f"{GUI_CACHE_PATH}/{self.res_namespace}/{framework}/{res_filename}" LOG.debug(f"Resolved page URI: {path}") if isfile(path): return path