Skip to content

Commit

Permalink
fix:modernize homescreen integration (#16)
Browse files Browse the repository at this point in the history
* fix:modernize homescreen integration

companion to OpenVoiceOS/OVOS-workshop#283

* packaging

* fix:add app name

* ovos-workshop>=2.4.0,<3.0.0
  • Loading branch information
JarbasAl authored Nov 15, 2024
1 parent 92a2fe8 commit 2e7f0db
Show file tree
Hide file tree
Showing 15 changed files with 11 additions and 320 deletions.
7 changes: 1 addition & 6 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
recursive-include dialog *
recursive-include vocab *
recursive-include locale *
recursive-include res *
recursive-include ui *
recursive-include skill *
include *.json
recursive-include gui *
include *.txt
4 changes: 2 additions & 2 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from ovos_utils.parse import fuzzy_match, MatchStrategy
from ovos_utils.process_utils import RuntimeRequirements
from ovos_utils.sound import get_sound_duration
from ovos_workshop.decorators import intent_handler
from ovos_workshop.decorators import intent_handler, homescreen_app
from ovos_workshop.decorators.ocp import ocp_search
from ovos_workshop.skills.common_play import OVOSCommonPlaybackSkill

Expand Down Expand Up @@ -54,7 +54,6 @@ def runtime_requirements(self):
def initialize(self):
self.ocp = OCPInterface(self.bus)
self.udev_thread = None
self.add_event(f'{self.skill_id}.home', self.show_home)
self.add_event(f'{self.skill_id}.scan', self.scan_local_media)
self.gui.register_handler('file.play', self.handle_file)
self.gui.register_handler('folder.play', self.handle_folder_playlist)
Expand Down Expand Up @@ -187,6 +186,7 @@ def handle_udev_event(self, action, device):
if device.device_node is not None:
self.gui.show_notification("A USB device was removed", noticetype="transient", style="info")

@homescreen_app(icon="ovos-file-browser.svg", name="File Browser")
@intent_handler("open.file.browser.intent")
def show_home(self, message):
"""
Expand Down
File renamed without changes
33 changes: 6 additions & 27 deletions res/desktop/skill.json → locale/en-us/skill.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
{
"skill_id": "skill-ovos-local-media",
"requirements": {
"python": [
"ovos_workshop~=0.0, >=0.0.12a20",
"ovos-utils~=0.0, >=0.0.28",
"ovos-bus-client"
],
"system": {},
"skill": []
},
"url": "https://github.com/OpenVoiceOS/skill-ovos-local-media",
"authorname": "OpenVoiceOS",
"skillname": "skill-ovos-local-media",
"branch": "dev",
"skill_id": "skill-ovos-local-media.openvoiceos",
"source": "https://github.com/OpenVoiceOS/skill-ovos-local-media",
"author": "OpenVoiceOS",
"name": "Local Media",
"license": "apache-2.0",
"icon": "https://raw.githubusercontent.com/FortAwesome/Font-Awesome/6.x/svgs/solid/folder-open.svg",
"description": "File Browser For Open Voice OS",
"short_description": "",
"description": "Local Media File Browser For Open Voice OS",
"examples": [
"start file browser app",
"show my usb drive",
Expand Down Expand Up @@ -45,13 +33,6 @@
"open usb",
"start usb browser app"
],
"credits": [
"OpenVoiceOS (@OpenVoiceOS)\nAditya Mehra (@AIIX)"
],
"category": "Daily",
"categories": [
"Daily"
],
"tags": [
"usb",
"local",
Expand All @@ -60,7 +41,5 @@
"filebrowser",
"manager",
"file"
],
"foldername": "skill-ovos-local-media",
"desktopFile": true
]
}
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ovos-utils >= 0.1.0
ovos-bus-client>=0.0.9,<2.0.0
ovos-workshop>=0.0.16
ovos-workshop>=2.4.0,<3.0.0
12 changes: 0 additions & 12 deletions res/desktop/skill-ovos-local-media.desktop

This file was deleted.

18 changes: 0 additions & 18 deletions scripts/bump_alpha.py

This file was deleted.

21 changes: 0 additions & 21 deletions scripts/bump_build.py

This file was deleted.

27 changes: 0 additions & 27 deletions scripts/bump_major.py

This file was deleted.

24 changes: 0 additions & 24 deletions scripts/bump_minor.py

This file was deleted.

70 changes: 0 additions & 70 deletions scripts/prepare_skillstore.py

This file was deleted.

53 changes: 0 additions & 53 deletions scripts/prepare_translations.py

This file was deleted.

41 changes: 0 additions & 41 deletions scripts/release_skillstore.py

This file was deleted.

13 changes: 0 additions & 13 deletions scripts/remove_alpha.py

This file was deleted.

Loading

0 comments on commit 2e7f0db

Please sign in to comment.