Refactor and some additions (#15)

* refactor intents

* additions

* fixes

* get rid of hardcoded min/max vol

* additional translations

* dutch translation

__init__.py

@@ -3,78 +3,111 @@
 from mycroft.util import normalize
 from mycroft.util.parse import extract_number
 
+MIN_VOLUME = 0
+MAX_VOLUME = 100
+
+
+def amount_validator(response):
+    amount = extract_number(normalize(response))
+    if amount:
+        return MIN_VOLUME <= amount <= MAX_VOLUME
+    return None
+
 
 class VolumeSkill(MycroftSkill):
+    def _query_volume(self, message):
+        response = self.bus.wait_for_response(message.forward("mycroft.volume.get"))
+        if response:
+            return int(response.data["percent"] * 100)
+        else:
+            self.speak_dialog("error.get.volume")
+            raise TimeoutError("Failed to get volume")
 
     # intents
-    @intent_handler(IntentBuilder("change_volume").require('change_volume'))
+    @intent_handler(IntentBuilder("change_volume").require("change").require("volume"))
     def handle_change_volume_intent(self, message):
-        utterance = message.data['utterance']
-        volume_change = extract_number(normalize(utterance))
-        self.bus.emit(message.forward("mycroft.volume.set",
-                                      {"percent": volume_change / 100}))
+        volume_change = extract_number(normalize(message.data["utterance"]))
+        if not volume_change:
+            response = self.get_response(
+                "volume.change.amount", validator=amount_validator
+            )
+            volume_change = extract_number(normalize(response))
         if volume_change >= 100:
-            self.speak_dialog('max.volume')
+            self.speak_dialog("volume.max")
         else:
-            self.speak_dialog('set.volume.percent',
-                              data={'level': volume_change})
+            self.speak_dialog("volume.set.percent", data={"level": int(volume_change)})
+        self.bus.emit(
+            message.forward("mycroft.volume.set", {"percent": volume_change / 100})
+        )
 
-    @intent_handler(IntentBuilder("less_volume").require('less_volume'))
+    @intent_handler(
+        IntentBuilder("less_volume").require("quieter").optionally("volume")
+    )
     def handle_less_volume_intent(self, message):
-        utterance = message.data['utterance']
-        volume_change = extract_number(normalize(utterance))
-        self.bus.emit(message.forward("mycroft.volume.decrease",
-                                      {"percent": volume_change / 100}))
+        volume = self._query_volume(message)
+        volume_change = extract_number(normalize(message.data["utterance"])) or 10
+        self.bus.emit(
+            message.forward("mycroft.volume.decrease", {"percent": volume_change / 100})
+        )
+        self.speak_dialog(
+            "volume.set.percent",
+            data={"level": max(MIN_VOLUME, int(volume - volume_change))},
+        )
 
-    @intent_handler(IntentBuilder("increase_volume").require('increase_volume'))
+    @intent_handler(
+        IntentBuilder("increase_volume").require("louder").optionally("volume")
+    )
     def handle_increase_volume_intent(self, message):
-        utterance = message.data['utterance']
-        volume_change = extract_number(normalize(utterance))
-        self.bus.emit(message.forward("mycroft.volume.increase",
-                                      {"percent": volume_change / 100}))
+        volume = self._query_volume(message)
+        if not (volume == MAX_VOLUME):
+            volume_change = extract_number(normalize(message.data["utterance"])) or 10
+            self.bus.emit(
+                message.forward(
+                    "mycroft.volume.increase", {"percent": volume_change / 100}
+                )
+            )
+            self.speak_dialog(
+                "volume.set.percent",
+                data={"level": min(MAX_VOLUME, int(volume + volume_change))},
+            )
+        else:
+            self.speak_dialog("volume.max.already")
 
-    @intent_file_handler('max_volume.intent')
+    @intent_file_handler("volume.max.intent")
     def handle_max_volume_intent(self, message):
-        self.bus.emit(message.forward("mycroft.volume.set",
-                                      {"percent": 1.0}))
-        self.speak_dialog('max.volume')
+        self.bus.emit(message.forward("mycroft.volume.set", {"percent": 1.0}))
+        self.speak_dialog("volume.max")
 
-    @intent_file_handler('high_volume.intent')
+    @intent_file_handler("volume.high.intent")
     def handle_high_volume_intent(self, message):
-        self.bus.emit(message.forward("mycroft.volume.set",
-                                      {"percent": 0.9}))
+        self.bus.emit(message.forward("mycroft.volume.set", {"percent": 0.9}))
 
-    @intent_file_handler('default_volume.intent')
+    @intent_file_handler("volume.default.intent")
     def handle_default_volume_intent(self, message):
-        self.bus.emit(message.forward("mycroft.volume.set",
-                                      {"percent": 0.7}))
+        self.bus.emit(message.forward("mycroft.volume.set", {"percent": 0.7}))
 
-    @intent_file_handler('low_volume.intent')
+    @intent_file_handler("volume.low.intent")
     def handle_low_volume_intent(self, message):
-        self.bus.emit(message.forward("mycroft.volume.set",
-                                      {"percent": 0.3}))
+        self.bus.emit(message.forward("mycroft.volume.set", {"percent": 0.3}))
 
-    @intent_file_handler('mute.intent')
+    @intent_file_handler("volume.mute.intent")
     def handle_mute_intent(self, message):
         self.bus.emit(message.forward("mycroft.volume.mute"))
 
-    @intent_file_handler('unmute.intent')
+    @intent_file_handler("volume.unmute.intent")
     def handle_unmute_intent(self, message):
         self.bus.emit(message.forward("mycroft.volume.unmute"))
 
-    @intent_file_handler('toggle_mute.intent')
+    @intent_file_handler("volume.mute.toggle.intent")
     def handle_toggle_unmute_intent(self, message):
         self.bus.emit(message.forward("mycroft.volume.mute.toggle"))
 
-    @intent_handler(IntentBuilder("current_volume").require('current_volume'))
+    @intent_handler(
+        IntentBuilder("current_volume").require("volume").optionally("current")
+    )
     def handle_query_volume(self, message):
-        response = self.bus.wait_for_response(message.forward("volume.get"))
-        if response:
-            volume = response.data["percent"] * 100
-            self.speak_dialog('volume.is', data={'volume': volume})
-        else:
-            # TODO dedicated error dialog
-            raise TimeoutError("Failed to get volume")
+        volume = self._query_volume(message)
+        self.speak_dialog("volume.current", data={"volume": volume})
 
 
 def create_skill():

locale/de-de/change.voc

@@ -0,0 +1,9 @@
+ändern
+änder
+ändere
+verändern
+verändere
+stelle
+einstellen
+verstellen
+verstelle

locale/de-de/current.voc

@@ -0,0 +1,5 @@
+aktuelle
+aktuell
+momentane
+momentan
+gerade

locale/de-de/error.get.volume.dialog

@@ -0,0 +1 @@
+Es scheint ein Problem zu geben. Ich konnte die aktuelle Laustärke nicht abfragen. 

locale/de-de/louder.voc

@@ -0,0 +1,5 @@
+lauter
+rauf
+höher
+höhere
+größere

locale/de-de/quieter.voc

@@ -0,0 +1,5 @@
+leiser
+runter
+herunter
+weniger
+niedriger

locale/de-de/volume.change.amount.dialog

@@ -0,0 +1 @@
+Auf welche Lautstärke? 0 bis 100 ist möglich.

locale/de-de/volume.max.already.dialog

@@ -0,0 +1 @@
+Die Lautstärke ist schon auf maximum

locale/de-de/volume.voc

@@ -0,0 +1,2 @@
+lautsprecher
+lautstärke

locale/en-us/change.voc

@@ -0,0 +1,3 @@
+set
+make
+change

locale/en-us/current.voc

@@ -0,0 +1 @@
+current

locale/en-us/error.get.volume.dialog

@@ -0,0 +1 @@
+There seems to be a problem. I could not query the current volume.

locale/en-us/louder.voc

@@ -0,0 +1,7 @@
+louder
+noisier
+noisily
+increase
+higher
+more
+up

locale/en-us/quieter.voc

@@ -0,0 +1,6 @@
+less
+decrease
+down
+lower
+quieter
+reduce

locale/en-us/volume.change.amount.dialog

@@ -0,0 +1 @@
+To what volume? 0 to 100 is possible.

locale/en-us/volume.max.already.dialog

@@ -0,0 +1 @@
+Volume already set to maximum level

locale/en-us/volume.voc

@@ -0,0 +1 @@
+volume

locale/es-es/change.voc

@@ -0,0 +1,5 @@
+# auto translated from en-us to es-es
+establecer
+cambio
+cambiar
+hacer

locale/es-es/current_volume.voc → locale/es-es/current.voc

@@ -1,2 +1,2 @@
 # auto translated from en-us to es-es
-volumen actual
+actual

locale/es-es/error.get.volume.dialog

@@ -0,0 +1 @@
+Parece haber un problema. No pude consultar el volumen actual.

locale/es-es/louder.voc

@@ -0,0 +1,7 @@
+# auto translated from en-us to es-es
+ruidoso
+ruidosa
+fuerte
+superior
+más
+subir

locale/es-es/quieter.voc

@@ -0,0 +1,10 @@
+# auto translated from en-us to es-es
+inferior
+bajar
+disminución
+menos
+reducir
+tranquilo
+tranquila
+silenciosa
+silencioso

locale/es-es/volume.change.amount.dialog

@@ -0,0 +1 @@
+A qué volumen? 0 a 100 es posible.

locale/es-es/volume.max.already.dialog

@@ -0,0 +1 @@
+Volumen ya establecido en el nivel máximo

locale/es-es/volume.set.percent.dialog

@@ -0,0 +1,4 @@
+# auto translated from en-us to es-es
+Volumen fijado a {level}%
+Volumen cambiado a {level}%
+Volumen actualizado a {level}%

locale/es-es/volume.voc

@@ -0,0 +1,3 @@
+# auto translated from en-us to es-es
+volumen
+volume

locale/fr-fr/change.voc

@@ -0,0 +1,4 @@
+# auto translated from en-us to fr-fr
+définir
+modifier
+faire

locale/fr-fr/current_volume.voc → locale/fr-fr/current.voc

@@ -1,2 +1,2 @@
 # auto translated from en-us to fr-fr
-volume actuel
+actuel

locale/fr-fr/error.get.volume.dialog

@@ -0,0 +1 @@
+Il semble y avoir un problème. Je n'ai pas pu interroger le volume actuel.

locale/fr-fr/louder.voc

@@ -0,0 +1,9 @@
+# auto translated from en-us to fr-fr
+Augmentation
+plus
+Montez
+supérieur
+bruyant
+bruyante
+bruyants
+fort

locale/fr-fr/quieter.voc

@@ -0,0 +1,9 @@
+# auto translated from en-us to fr-fr
+réduire
+inférieur
+moins
+baisser
+diminution
+baisse
+silencieux
+silenciese