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

Use less powerful kills if possible

Browse Source
This commit is contained in:
Juan Canham 2020-04-06 19:51:36 +01:00
parent d6a966d14c
commit c93c660ee8
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
__init__.py
View File

@ -67,17 +67,30 @@ class DesktopLauncherSkill(MycroftSkill):
@intent_handler(IntentBuilder('CloseDesktopApplicationIntent') @intent_handler(IntentBuilder('CloseDesktopApplicationIntent')
.require('CloseKeyword').require('Application')) .require('CloseKeyword').require('Application'))
def handle_close_desktop_app(self, message): def handle_close_desktop_app(self, message):
"""Close application using killall -9.""" """Close application using killall"""
app_name = message.data.get('Application') app_name = message.data.get("Application")
self.log.info('Killing {}'.format(app_name)) if not self.kill_process_by_name(app_name):
if subprocess.call(['killall', '-9', app_name]): self.log.info(
# Couldn't be killed try to get executable from desktop file "Couldn't kill {} try to get executable from desktop file".format(
app_name
)
)
apps = self.appmap.get(app_name) apps = self.appmap.get(app_name)
# Try to find executable name
if apps: if apps:
app_name = apps[0].get_string('Exec') app_name = apps[0].get_string("Exec")
subprocess.call(['killall', '-9', app_name]) if not self.kill_process_by_name(app_name):
self.speak("failed to close {}".format(app_name))
def kill_process_by_name(self, app_name):
"""Kill a process using the least powerful signal that works."""
self.log.info("Killing {}".format(app_name))
for signal in ["SIGINT", "SIGQUIT", "SIGTERM", "SIGKILL"]:
if subprocess.call(["killall", "-s", signal, app_name]) == 0:
self.log.info("Killed {} using {}".format(app_name, signal))
return True
return False
@intent_handler(IntentBuilder('LaunchWebsiteIntent') @intent_handler(IntentBuilder('LaunchWebsiteIntent')
.require('LaunchKeyword').require('Website')) .require('LaunchKeyword').require('Website'))