Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compat. with pages2uri extra_directories #162

Merged
merged 2 commits into from
Jun 14, 2023
Merged

Fix compat. with pages2uri extra_directories #162

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d532f77
Fix compat. with `pages2uri` extra_directories
NeonDaniel Jun 13, 2023
8a3e6a1
Fix bad refactor
NeonDaniel Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ovos_utils/gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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 = 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 \
Expand Down