diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/__init__.py b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/__init__.py index 85b46c4d..3d05b725 100644 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/__init__.py +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/__init__.py @@ -40,13 +40,6 @@ class MycroftOS(MycroftSkill): self.snapclient_enabled = self.settings.get('snapclient') self.snapserver_enabled = self.settings.get('snapserver') self.mpd_enabled = self.settings.get('mpd') - self.airplay_started = False - self.sshd_started = False - self.spotify_started = False - self.btspeaker_started = False - self.snapclient_started = False - self.snapserver_started = False - self.mpd_started = False def initialize(self): """ Perform initalization. @@ -344,162 +337,6 @@ class MycroftOS(MycroftSkill): self.mpd_started = False self.speak_dialog('DisabledMPD') - def start_ssh(self): - os.system('sudo systemctl start sshd.service') - self.speak_dialog('StartedSSH') - - def stop_ssh(self): - os.system('sudo systemctl stop sshd.service') - self.speak_dialog('StoppedSSH') - - def start_airplay(self): - os.system('sudo systemctl start shairport-sync.service') - self.speak_dialog('StartedAirplay') - - def stop_airplay(self): - os.system('sudo systemctl stop shairport-sync.service') - self.speak_dialog('StoppedAirplay') - - def start_spotify(self): - os.system('sudo systemctl start spotifyd.service') - self.speak_dialog('StartedSpotify') - - def stop_spotify(self): - os.system('sudo systemctl stop spotifyd.service') - self.speak_dialog('StoppedSpotify') - - def start_btspeaker(self): - os.system('sudo systemctl start btspeaker.service') - self.speak_dialog('StartedBTspeaker') - - def stop_btspeaker(self): - os.system('sudo systemctl stop btspeaker.service') - self.speak_dialog('StoppedBTspeaker') - - def start_snapclient(self): - os.system('sudo systemctl start snapclient.service') - self.speak_dialog('StartedSnapclient') - - def stop_snapclient(self): - os.system('sudo systemctl stop snapclient.service') - self.speak_dialog('StoppedSnapclient') - - def start_snapserver(self): - os.system('sudo systemctl start snapserver.service') - self.speak_dialog('StartedSnapserver') - - def stop_snapserver(self): - os.system('sudo systemctl stop snapserver.service') - self.speak_dialog('StoppedSnapserver') - - def start_mpd(self): - os.system('sudo systemctl start mpd.service') - self.speak_dialog('StartedMPD') - - def stop_mpd(self): - os.system('sudo systemctl stop mpd.service') - self.speak_dialog('StoppedMPD') - - - # Intent handlers - @intent_file_handler('StartSSH.intent') - def on_start_ssh(self, message): - if self.sshd_started is False: - self.start_ssh() - else: - self.speak_dialog('AlreadyStartedSSH') - - @intent_file_handler('StopSSH.intent') - def on_stop_ssh(self, message): - if self.sshd_started is True: - self.stop_ssh() - else: - self.speak_dialog('AlreadyStoppedSSH') - - @intent_file_handler('StartAirPlay.intent') - def on_start_airplay(self, message): - if self.airplay_started is False: - self.start_airplay() - else: - self.speak_dialog('AlreadyStartedAirPlay') - - @intent_file_handler('StopAirPlay.intent') - def on_stop_airplay(self, message): - if self.airplay_started is True: - self.stop_airplay() - else: - self.speak_dialog('AlreadyStoppedAirPlay') - - @intent_file_handler('StartSpotify.intent') - def on_start_spotify(self, message): - if self.spotify_started is False: - self.start_spotify() - else: - self.speak_dialog('AlreadyStartedSpotify') - - @intent_file_handler('StopSpotify.intent') - def on_stop_spotify(self, message): - if self.spotify_started is True: - self.stop_spotify() - else: - self.speak_dialog('AlreadyStoppedSpotify') - - @intent_file_handler('StartBTspeaker.intent') - def on_start_btspeaker(self, message): - if self.btspeaker_started is False: - self.start_btspeaker() - else: - self.speak_dialog('AlreadyStartedBTspeaker') - - @intent_file_handler('StopBTspeaker.intent') - def on_stop_btspeaker(self, message): - if self.btspeaker_started is True: - self.stop_btspeaker() - else: - self.speak_dialog('AlreadyStoppedBTspeaker') - - @intent_file_handler('StartSnapclient.intent') - def on_start_snapclient(self, message): - if self.snapclient_started is False: - self.start_snapclient() - else: - self.speak_dialog('AlreadyStartedSnapclient') - - @intent_file_handler('StopSnapclient.intent') - def on_stop_snapclient(self, message): - if self.snapclient_started is True: - self.stop_snapclient() - else: - self.speak_dialog('AlreadyStoppedSnapclient') - - @intent_file_handler('StartSnapserver.intent') - def on_start_snapserver(self, message): - if self.snapserver_started is False: - self.start_snapserver() - else: - self.speak_dialog('AlreadyStartedSnapserver') - - @intent_file_handler('StopSnapserver.intent') - def on_stop_snapserver(self, message): - if self.snapserver_started is True: - self.stop_snapserver() - else: - self.speak_dialog('AlreadyStoppedSnapserver') - - @intent_file_handler('StartMPD.intent') - def on_start_mpd(self, message): - if self.mpd_started is False: - self.start_mpd() - else: - self.speak_dialog('AlreadyStartedMPD') - - @intent_file_handler('StopMPD.intent') - def on_stop_mpd(self, message): - if self.mpd_started is True: - self.stop_mpd() - else: - self.speak_dialog('AlreadyStoppedMPD') - def create_skill(): return MycroftOS() \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartAirPlay.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartAirPlay.intent deleted file mode 100644 index b2bfa088..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartAirPlay.intent +++ /dev/null @@ -1,6 +0,0 @@ -Start airplay -Start air play -Start shareport sync -Start share port sync -Start shareport -Start share port \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartBTspeaker.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartBTspeaker.intent deleted file mode 100644 index 3fa43b4c..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartBTspeaker.intent +++ /dev/null @@ -1,2 +0,0 @@ -Start bluetooth -Start blue tooth \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartMPD.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartMPD.intent deleted file mode 100644 index 9ccc4532..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartMPD.intent +++ /dev/null @@ -1,4 +0,0 @@ -Start M P D -Start M.P.D. -Start MPD -Start Media Player Daemon \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartSSH.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartSSH.intent deleted file mode 100644 index d6779216..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartSSH.intent +++ /dev/null @@ -1,4 +0,0 @@ -Start S S H -Start S.S.H. -Start SSH -Start secure shell \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartSnapclient.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartSnapclient.intent deleted file mode 100644 index a981390c..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartSnapclient.intent +++ /dev/null @@ -1,2 +0,0 @@ -Start snapclient -Start snap client \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartSnapserver.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartSnapserver.intent deleted file mode 100644 index fe9e9028..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartSnapserver.intent +++ /dev/null @@ -1,2 +0,0 @@ -Start snapserver -Start snap server \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartSpotify.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartSpotify.intent deleted file mode 100644 index 533bcdf8..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StartSpotify.intent +++ /dev/null @@ -1 +0,0 @@ -Start Spotify \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopAirPlay.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopAirPlay.intent deleted file mode 100644 index 67952bd8..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopAirPlay.intent +++ /dev/null @@ -1,6 +0,0 @@ -Stop airplay -Stop air play -Stop shareport sync -Stop share port sync -Stop shareport -Stop share port \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopBTspeaker.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopBTspeaker.intent deleted file mode 100644 index 4b12141d..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopBTspeaker.intent +++ /dev/null @@ -1,2 +0,0 @@ -Stop bluetooth -Stop blue tooth \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopMPD.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopMPD.intent deleted file mode 100644 index 1ab5d47b..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopMPD.intent +++ /dev/null @@ -1,4 +0,0 @@ -Stop M P D -Stop M.P.D. -Stop MPD -Stop Media Player Daemon \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopSSH.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopSSH.intent deleted file mode 100644 index 94f10ea3..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopSSH.intent +++ /dev/null @@ -1,4 +0,0 @@ -Stop S S H -Stop S.S.H. -Stop SSH -Stop secure shell \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopSnapclient.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopSnapclient.intent deleted file mode 100644 index e5b3befe..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopSnapclient.intent +++ /dev/null @@ -1,2 +0,0 @@ -Stop snapclient -Stop snap client \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopSnapserver.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopSnapserver.intent deleted file mode 100644 index 70da5a44..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopSnapserver.intent +++ /dev/null @@ -1,2 +0,0 @@ -Stop snapserver -Stop snap server \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopSpotify.intent b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopSpotify.intent deleted file mode 100644 index 95e72799..00000000 --- a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/vocab/en-us/StopSpotify.intent +++ /dev/null @@ -1 +0,0 @@ -Stop Spotify \ No newline at end of file