JuanCanham/skill-desktop-launcher
1
0
Fork 0
mirror of https://github.com/JuanCanham/skill-desktop-launcher.git synced 2024-11-22 17:00:10 +00:00
Code Issues Releases Wiki Activity

Modernize skill

Browse Source 
- Use intent_handler decorators
- " -> '
- Add docstrings
- Remove __author__ field
- remove old logger
This commit is contained in:
Åke Forslund 2019-11-06 11:34:08 +01:00
parent f43131107f
commit 78557ec064
1 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
__init__.py
View File

@ -11,29 +11,22 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import webbrowser import webbrowser
import subprocess import subprocess
from adapt.intent import IntentBuilder from adapt.intent import IntentBuilder
from adapt.tools.text.tokenizer import EnglishTokenizer from adapt.tools.text.tokenizer import EnglishTokenizer
from os.path import dirname, join
from mycroft.skills.core import MycroftSkill from mycroft import MycroftSkill, intent_handler
from mycroft.util.log import getLogger
from urllib.parse import quote from urllib.parse import quote
from gi.repository import Gio as gio from gi.repository import Gio as gio
logger = getLogger(__name__) IFL_TEMPLATE = 'http://www.google.com/search?&sourceid=navclient&btnI=I&q=%s'
__author__ = 'seanfitz'
IFL_TEMPLATE = "http://www.google.com/search?&sourceid=navclient&btnI=I&q=%s"
class DesktopLauncherSkill(MycroftSkill): class DesktopLauncherSkill(MycroftSkill):
def __init__(self): def __init__(self):
MycroftSkill.__init__(self, "DesktopLauncherSkill") super().__init__()
self.appmap = {} self.appmap = {}
def initialize(self): def initialize(self):
@ -41,7 +34,7 @@ class DesktopLauncherSkill(MycroftSkill):
for app in gio.app_info_get_all(): for app in gio.app_info_get_all():
name = app.get_name().lower() name = app.get_name().lower()
if name == None: if name is None:
# Likely an empty .desktop entry, skip it # Likely an empty .desktop entry, skip it
continue continue
entry = [app] entry = [app]
@ -52,57 +45,49 @@ class DesktopLauncherSkill(MycroftSkill):
else: else:
self.appmap[name] = entry self.appmap[name] = entry
self.register_vocabulary(name, "Application") self.register_vocabulary(name, 'Application')
if name != tokenized_name: if name != tokenized_name:
self.register_vocabulary(tokenized_name, "Application") self.register_vocabulary(tokenized_name, 'Application')
if tokenized_name in self.appmap: if tokenized_name in self.appmap:
self.appmap[tokenized_name] += entry self.appmap[tokenized_name] += entry
else: else:
self.appmap[tokenized_name] = entry self.appmap[tokenized_name] = entry
launch_intent = IntentBuilder( @intent_handler(IntentBuilder('LaunchDesktopApplicationIntent')
"LaunchDesktopApplicationIntent").require("LaunchKeyword").require( .require('LaunchKeyword')
"Application").build() .require('Application'))
self.register_intent(launch_intent, self.handle_launch_desktop_app)
close_intent = IntentBuilder(
"CloseDesktopApplicationIntent").require("CloseKeyword").require(
"Application").build()
self.register_intent(close_intent, self.handle_close_desktop_app)
launch_website_intent = IntentBuilder(
"LaunchWebsiteIntent").require("LaunchKeyword").require(
"Website").build()
self.register_intent(launch_website_intent, self.handle_launch_website)
search_website = IntentBuilder("SearchWebsiteIntent").require(
"SearchKeyword").require("Website").require(
"SearchTerms").build()
self.register_intent(search_website, self.handle_search_website)
def handle_launch_desktop_app(self, message): def handle_launch_desktop_app(self, message):
"""Launch a dektop application using Desktop file."""
app_name = message.data.get('Application') app_name = message.data.get('Application')
apps = self.appmap.get(app_name) apps = self.appmap.get(app_name)
if apps and len(apps) > 0: if apps and len(apps) > 0:
self.log.info('Launching {}'.format(app_name))
apps[0].launch() apps[0].launch()
@intent_handler(IntentBuilder('CloseDesktopApplicationIntent')
.require('CloseKeyword').require('Application'))
def handle_close_desktop_app(self, message): def handle_close_desktop_app(self, message):
"""Close application using killall -9."""
app_name = message.data.get('Application') app_name = message.data.get('Application')
subprocess.call( [ "killall", "-9", app_name ] ) subprocess.call(['killall', '-9', app_name])
@intent_handler(IntentBuilder('LaunchWebsiteIntent')
.require('LaunchKeyword').require('Website'))
def handle_launch_website(self, message): def handle_launch_website(self, message):
"""Open a website in the selected webbrowser."""
site = message.data.get("Website") site = message.data.get("Website")
webbrowser.open(IFL_TEMPLATE % (quote(site))) webbrowser.open(IFL_TEMPLATE % (quote(site)))
@intent_handler(IntentBuilder('SearchWebsiteIntent')
.require('SearchKeyword').require('Website')
.require('SearchTerms'))
def handle_search_website(self, message): def handle_search_website(self, message):
site = message.data.get("Website") """Open a webbrowser searching for query."""
search_terms = message.data.get("SearchTerms") site = message.data.get('Website')
search_str = site + " " + search_terms search_terms = message.data.get('SearchTerms')
search_str = '{} {}'.format(site, search_terms)
webbrowser.open(IFL_TEMPLATE % (quote(search_str))) webbrowser.open(IFL_TEMPLATE % (quote(search_str)))
def stop(self):
pass
def create_skill(): def create_skill():
return DesktopLauncherSkill() return DesktopLauncherSkill()