From 31a7a80f0e4816772203eef957114c74edb1bf5d Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Fri, 15 Nov 2024 00:23:41 +0000 Subject: [PATCH 1/3] fix:icon file path (#285) use self.res_dir not self.root_dir to allow non standard locations (eg. OCP) allow skills to load even if icon is missing, but log an error and dont register app with homescreen --- ovos_workshop/skills/ovos.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ovos_workshop/skills/ovos.py b/ovos_workshop/skills/ovos.py index 3d45208..6b76d63 100644 --- a/ovos_workshop/skills/ovos.py +++ b/ovos_workshop/skills/ovos.py @@ -930,7 +930,10 @@ def register_homescreen_app(self, icon: str, name: str, event: str): # it is the only path assured to be accessible both by skills and GUI GUI_CACHE_PATH = get_xdg_cache_save_path('ovos_gui') - full_icon_path = f"{self.root_dir}/gui/{icon}" + full_icon_path = f"{self.res_dir}/gui/{icon}" + if not os.path.isfile(full_icon_path): + self.log.error(f"failed to register homescreen app, icon does not exist: {full_icon_path}") + return shared_path = f"{GUI_CACHE_PATH}/{self.skill_id}/{icon}" shutil.copy(full_icon_path, shared_path) From 46e9c42a92d4732bfe3c6015f48f08efdeeb8ae1 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Fri, 15 Nov 2024 00:23:53 +0000 Subject: [PATCH 2/3] Increment Version to 2.4.1a1 --- ovos_workshop/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ovos_workshop/version.py b/ovos_workshop/version.py index 6959d54..b55c69f 100644 --- a/ovos_workshop/version.py +++ b/ovos_workshop/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 2 VERSION_MINOR = 4 -VERSION_BUILD = 0 -VERSION_ALPHA = 0 +VERSION_BUILD = 1 +VERSION_ALPHA = 1 # END_VERSION_BLOCK From 1afab61340c3b2e4f5ff55df1157ee671ec21e25 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Fri, 15 Nov 2024 00:24:15 +0000 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d95d38..e556819 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog -## [2.4.0a1](https://github.com/OpenVoiceOS/OVOS-workshop/tree/2.4.0a1) (2024-11-15) +## [2.4.1a1](https://github.com/OpenVoiceOS/OVOS-workshop/tree/2.4.1a1) (2024-11-15) -[Full Changelog](https://github.com/OpenVoiceOS/OVOS-workshop/compare/2.3.2...2.4.0a1) +[Full Changelog](https://github.com/OpenVoiceOS/OVOS-workshop/compare/2.4.0...2.4.1a1) **Merged pull requests:** -- feat:skilljson and homescreen [\#283](https://github.com/OpenVoiceOS/OVOS-workshop/pull/283) ([JarbasAl](https://github.com/JarbasAl)) +- fix:icon file path [\#285](https://github.com/OpenVoiceOS/OVOS-workshop/pull/285) ([JarbasAl](https://github.com/JarbasAl))