From d532f7732b11f885135c361ddb9f4d7684ab3522 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 13 Jun 2023 16:48:13 -0700 Subject: [PATCH 1/2] Fix compat. with `pages2uri` extra_directories --- ovos_utils/gui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ovos_utils/gui.py b/ovos_utils/gui.py index 4935a340..733c6d53 100644 --- a/ovos_utils/gui.py +++ b/ovos_utils/gui.py @@ -530,7 +530,7 @@ def __init__(self, skill_id: str, bus = None, self._skill_id = skill_id self.on_gui_changed_callback = None self._events = [] - self.ui_directories = ui_directories + self.ui_directories = ui_directories or dict() if bus: self.set_bus(bus) @@ -744,7 +744,7 @@ def send_event(self, event_name: str, def _pages2uri(self, page_names: List[str]) -> List[str]: # Convert pages to full reference page_urls = [] - extra_dirs = [self.resource_dir] or list() + extra_dirs = [self.ui_directories.values()] or list() for name in page_names: # Prefer plugin-specific resources first, then fallback to core page = resolve_ovos_resource_file(name, extra_dirs) or \ From 8a3e6a1ce12d993bf41ad46e371d2db21598476c Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 13 Jun 2023 17:00:48 -0700 Subject: [PATCH 2/2] Fix bad refactor --- ovos_utils/gui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_utils/gui.py b/ovos_utils/gui.py index 733c6d53..02a16b3c 100644 --- a/ovos_utils/gui.py +++ b/ovos_utils/gui.py @@ -744,7 +744,7 @@ def send_event(self, event_name: str, def _pages2uri(self, page_names: List[str]) -> List[str]: # Convert pages to full reference page_urls = [] - extra_dirs = [self.ui_directories.values()] or list() + extra_dirs = list(self.ui_directories.values()) or list() for name in page_names: # Prefer plugin-specific resources first, then fallback to core page = resolve_ovos_resource_file(name, extra_dirs) or \