diff --git a/MANIFEST.in b/MANIFEST.in index bb58308..b968593 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,3 @@ -recursive-include dialog * -recursive-include vocab * recursive-include locale * recursive-include res * -recursive-include ui * -recursive-include skill * \ No newline at end of file +recursive-include gui * \ No newline at end of file diff --git a/__init__.py b/__init__.py index 8e54fc7..f47e79c 100755 --- a/__init__.py +++ b/__init__.py @@ -193,7 +193,7 @@ def handle_search(self, message): "image": None, } - self.gui.show_animated_image(join(dirname(__file__), "ui", "jumping.gif")) + self.gui.show_animated_image("jumping.gif") self.speak_dialog("searching", {"query": query}) diff --git a/ui/jumping.gif b/gui/all/jumping.gif similarity index 100% rename from ui/jumping.gif rename to gui/all/jumping.gif diff --git a/locale/en-us/skill.json b/locale/en-us/skill.json new file mode 100644 index 0000000..a21673d --- /dev/null +++ b/locale/en-us/skill.json @@ -0,0 +1,23 @@ +{ + "skill_id": "skill-ovos-wikipedia.openvoiceos", + "source": "https://github.com/OpenVoiceOS/skill-ovos-wikipedia", + "name": "Wikipedia", + "description": "Query Wikipedia for answers to all your questions. Get just a summary, or ask for more to get in-depth information.", + "examples": [ + "Tell me about Elon Musk", + "Tell me about beans", + "Check Wikipedia for beans", + "Tell me about the Pembroke Welsh Corgi", + "Search for chocolate", + "More information", + "Tell me More" + ], + "tags": [ + "wikipedia", + "encyclopedia", + "general-knowledge", + "wiki", + "question", + "query" + ] +} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 6b9940f..147d43e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ ovos-utils>=0.0.38,<1.0.0 ovos_workshop>=0.0.15,<3.0.0 ovos-plugin-manager>=0.0.26,<1.0.0 +ovos-bus-client>=1.0.1 \ No newline at end of file diff --git a/res/desktop/skill-wikipedia-for-humans.desktop b/res/desktop/skill-wikipedia-for-humans.desktop deleted file mode 100644 index 53cec35..0000000 --- a/res/desktop/skill-wikipedia-for-humans.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Terminal=false -Type=Application -Name=DuckDuckGo Skill -Exec=mycroft-gui-app --hideTextInput --skill=skill-wikipedia-for-humans.jarbasskills.home -Icon=wikipedia.png -Categories=VoiceApp -StartupNotify=false -X-DBUS-StartupType=None -X-KDE-StartupNotify=false diff --git a/res/desktop/skill.json b/res/desktop/skill.json deleted file mode 100644 index 74a3983..0000000 --- a/res/desktop/skill.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "authorname": "OpenVoiceOS", - "foldername": "skill-ovos-wikipedia", - "url": "https://github.com/OpenVoiceOS/skill-ovos-wikipedia", - "branch": "dev", - "license": "apache-2.0", - "tags": [ - "encyclopedia", - "question", - "general-knowledge", - "query", - "wiki", - "wikipedia", - "Information", - "permissive-license" - ], - "short_description": "Wikipedia", - "last_updated": "2022-10-11T14:30:36Z", - "icon": "https://raw.githack.com/FortAwesome/Font-Awesome/master/svgs/brands/wikipedia-w.svg", - "skillname": "Wikipedia", - "description": "Query [Wikipedia](https://www.wikipedia.org) for answers to all your questions. Get just a summary, or ask for more to get in-depth information.\n \n This Skill uses the [Wikipedia for humans](https://github.com/OpenJarbas/wikipedia_for_humans) library. \n\n![](./gui.gif)", - "examples": [ - "tell me about {query}", - "wiki {query}", - "random wiki page", - "play the wiki roulette", - "what does wiki say about {query}", - "display random wikipedia", - "check wikipedia for {query}", - "show random wiki", - "play the wikipedia roulette", - "tell us about {query}", - "random wiki", - "wiki roulette", - "wikipedia roulette", - "play wikipedia roulette", - "random wikipedia page", - "play wiki roulette", - "display random wiki", - "check wiki for {query}", - "wikipedia {query}", - "search wiki for {query}", - "open random wikipedia", - "random wikipedia", - "what does wikipedia say about {query}", - "search wikipedia for {query}", - "show random wikipedia", - "open random wiki" - ], - "category": "Information", - "categories": [ - "Information" - ], - "logo": "https://raw.githubusercontent.com/OpenVoiceOS/skill-ovos-wikipedia/dev/logo.png", - "requirements": { - "python": [ - "neon_solver_wikipedia_plugin", - "neon-solvers", - "ovos_utils", - "wikipedia_for_humans>=0.2.3" - ], - "skill": [], - "system": {} - }, - "desktopFile": false -} \ No newline at end of file