Merge branch 'master' into facebox

kylegordon · May 13, 2020 · 573de3e · 573de3e
2 parents dc2d4c1 + 7bdbcba
commit 573de3e
Show file tree

Hide file tree

Showing 37 changed files with 1,593 additions and 921 deletions.
diff --git a/automation/cheerlights.yaml b/automation/cheerlights.yaml
@@ -0,0 +1,14 @@
+alias: Cheerlights
+trigger:
+  platform: mqtt
+  topic: cheerlightsRGB
+action:
+  service_template: light.turn_on
+  data_template:
+    brightness_pct: 50
+    rgb_color:
+      - "{{ trigger.payload[1:3] | int(0,16) }}"
+      - "{{ trigger.payload[3:5] | int(0,16) }}"
+      - "{{ trigger.payload[-2:] | int(0,16) }}"
+    entity_id:
+      - light.sense_gloworb
diff --git a/automation/front_motion_night.yaml b/automation/front_motion_night.yaml
@@ -26,5 +26,8 @@ action:
       brightness_pct: 100
       white_value: 255
       color_temp: 153
+  # If this evaluates to false, the action will stop here.
+  - condition: template
+    value_template: "{{ not is_state('binary_sensor.home_occupied') }}"
   - service: light.turn_on
     entity_id: light.front_door_floodlights
diff --git a/custom_components/alexa_media/.translations/de.json b/custom_components/alexa_media/.translations/de.json
@@ -1,54 +1,53 @@
 {
-    "config": {
-        "error": {
-            "identifier_exists": "Diese Email ist bereits registriert",
-            "invalid_credentials": "Falsche Zugangsdaten"
+  "config": {
+    "error": {
+      "identifier_exists": "Diese Email ist bereits registriert",
+      "invalid_credentials": "Falsche Zugangsdaten"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "password": "Passwort",
+          "email": "Email Adresse",
+          "url": "Amazon Region (z.B., amazon.de)",
+          "include_devices": "Eingebundene Geräte (komma getrennnt)",
+          "exclude_devices": "Ausgeschlossene Geräte (komma getrennnt)",
+          "debug": "Erweitertes debugging",
+          "scan_interval": "Sekunden zwischen den Scans"
         },
-        "step": {
-            "user": {
-                "data": {
-                    "password": "Passwort",
-                    "email": "Email Adresse",
-                    "url": "Amazon Region (z.B., amazon.de)",
-                    "include_devices": "Eingebundene Geräte (komma getrennnt)",
-                    "exclude_devices": "Ausgeschlossene Geräte (komma getrennnt)",
-                    "debug": "Erweitertes debugging",
-                    "scan_interval": "Sekunden zwischen den Scans"
-                },
-                "description": "Bitte geben Sie ihre Informationen ein.",
-                "title": "Alexa Media Player - Konfiguration"
-            },
-            "captcha": {
-                "data": {
-                    "password": "Passwort",
-                    "captcha": "Captcha"
-                },
-                "description": "**{email} - alexa.{url}**\n{message}\n {captcha_image}",
-                "title": "Alexa Media Player - Captcha"
-            },
-            "twofactor": {
-                "data": {
-                    "securitycode": "2FA Code"
-                },
-                "description": "**{email} - alexa.{url}**\nDen Zwei Faktor Pin eingeben.\n{message}",
-                "title": "Alexa Media Player - Zwei Faktor Authentifizierung"
-            },
-            "authselect": {
-                "data": {
-                    "authselectoption": "Einmal Pin Methode"
-                },
-                "description": "**{email} - alexa.{url}**\n{message}",
-                "title": "Alexa Media Player - Einmal Pin Passwort"
-            },
-            "claimspicker": {
-                "data": {
-                    "authselectoption": "Verifizierungs Methode"
-                },
-                "description": "**{email} - alexa.{url}**\nBitte Verifizierungs Methode auswählen. (z.B., `sms` oder `email`)\n{message}",
-                "title": "Alexa Media Player - Verifizierungs Methode"
-            }
-
+        "description": "Bitte geben Sie ihre Informationen ein.",
+        "title": "Alexa Media Player - Konfiguration"
+      },
+      "captcha": {
+        "data": {
+          "password": "Passwort",
+          "captcha": "Captcha"
         },
-        "title": "Alexa Media Player"
-    }
+        "description": "**{email} - alexa.{url}**\n{message}\n {captcha_image}",
+        "title": "Alexa Media Player - Captcha"
+      },
+      "twofactor": {
+        "data": {
+          "securitycode": "2FA Code"
+        },
+        "description": "**{email} - alexa.{url}**\nDen Zwei Faktor Pin eingeben.\n{message}",
+        "title": "Alexa Media Player - Zwei Faktor Authentifizierung"
+      },
+      "authselect": {
+        "data": {
+          "authselectoption": "Einmal Pin Methode"
+        },
+        "description": "**{email} - alexa.{url}**\n{message}",
+        "title": "Alexa Media Player - Einmal Pin Passwort"
+      },
+      "claimspicker": {
+        "data": {
+          "authselectoption": "Verifizierungs Methode"
+        },
+        "description": "**{email} - alexa.{url}**\nBitte Verifizierungs Methode auswählen. (z.B., `0` oder `1`)\n{message}",
+        "title": "Alexa Media Player - Verifizierungs Methode"
+      }
+    },
+    "title": "Alexa Media Player"
+  }
 }
diff --git a/custom_components/alexa_media/.translations/en.json b/custom_components/alexa_media/.translations/en.json
@@ -1,56 +1,55 @@
 {
-    "config": {
-        "error": {
-            "connection_error": "Error connecting; check network and retry",
-            "identifier_exists": "Email for Alexa URL already registered",
-            "invalid_credentials": "Invalid credentials",
-            "unknown_error": "Unknown error, please report with logs"
+  "config": {
+    "error": {
+      "connection_error": "Error connecting; check network and retry",
+      "identifier_exists": "Email for Alexa URL already registered",
+      "invalid_credentials": "Invalid credentials",
+      "unknown_error": "Unknown error, please report with logs"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "password": "Password",
+          "email": "Email Address",
+          "url": "Amazon region domain (e.g., amazon.co.uk)",
+          "include_devices": "Included device (comma separated)",
+          "exclude_devices": "Excluded device (comma separated)",
+          "debug": "Advanced debugging",
+          "scan_interval": "Seconds between scans"
         },
-        "step": {
-            "user": {
-                "data": {
-                    "password": "Password",
-                    "email": "Email Address",
-                    "url": "Amazon region domain (e.g., amazon.co.uk)",
-                    "include_devices": "Included device (comma separated)",
-                    "exclude_devices": "Excluded device (comma separated)",
-                    "debug": "Advanced debugging",
-                    "scan_interval": "Seconds between scans"
-                },
-                "description": "Please enter your information.",
-                "title": "Alexa Media Player - Configuration"
-            },
-            "captcha": {
-                "data": {
-                    "password": "Password",
-                    "captcha": "Captcha"
-                },
-                "description": "**{email} - alexa.{url}**\n{message}\n {captcha_image}",
-                "title": "Alexa Media Player - Captcha"
-            },
-            "twofactor": {
-                "data": {
-                    "securitycode": "2FA Code"
-                },
-                "description": "**{email} - alexa.{url}**\nEnter the One Time Password (OTP).\n{message}",
-                "title": "Alexa Media Player - Two Factor Authentication"
-            },
-            "authselect": {
-                "data": {
-                    "authselectoption": "OTP method"
-                },
-                "description": "**{email} - alexa.{url}**\n{message}",
-                "title": "Alexa Media Player - One Time Password"
-            },
-            "claimspicker": {
-                "data": {
-                    "authselectoption": "Verification method"
-                },
-                "description": "**{email} - alexa.{url}**\nPlease select verification method. (e.g., `sms` or `email`)\n{message}",
-                "title": "Alexa Media Player - Verification Method"
-            }
-
+        "description": "Please enter your information.",
+        "title": "Alexa Media Player - Configuration"
+      },
+      "captcha": {
+        "data": {
+          "password": "Password",
+          "captcha": "Captcha"
         },
-        "title": "Alexa Media Player"
-    }
+        "description": "**{email} - alexa.{url}**\n{message}\n {captcha_image}",
+        "title": "Alexa Media Player - Captcha"
+      },
+      "twofactor": {
+        "data": {
+          "securitycode": "2FA Code"
+        },
+        "description": "**{email} - alexa.{url}**\nEnter the One Time Password (OTP).\n{message}",
+        "title": "Alexa Media Player - Two Factor Authentication"
+      },
+      "authselect": {
+        "data": {
+          "authselectoption": "OTP method"
+        },
+        "description": "**{email} - alexa.{url}**\n{message}",
+        "title": "Alexa Media Player - One Time Password"
+      },
+      "claimspicker": {
+        "data": {
+          "authselectoption": "Verification method"
+        },
+        "description": "**{email} - alexa.{url}**\nPlease select verification method by number. (e.g., `0` or `1`)\n{message}",
+        "title": "Alexa Media Player - Verification Method"
+      }
+    },
+    "title": "Alexa Media Player"
+  }
 }
diff --git a/custom_components/alexa_media/.translations/it.json b/custom_components/alexa_media/.translations/it.json
@@ -1,54 +1,53 @@
 {
-    "config": {
-        "error": {
-            "identifier_exists": "L'Email per l'URL di Alexa è già stata registrata",
-            "invalid_credentials": "Credenziali non valide"
+  "config": {
+    "error": {
+      "identifier_exists": "L'Email per l'URL di Alexa è già stata registrata",
+      "invalid_credentials": "Credenziali non valide"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "password": "Password",
+          "email": "Indirizzo email",
+          "url": "Regione del dominio Amazon (e.g., amazon.it)",
+          "include_devices": "Dispositivi da includere (separati da virgola)",
+          "exclude_devices": "Dispositivi da escludere (separati da virgola)",
+          "debug": "Debug avanzato",
+          "scan_interval": "Tempo in secondi fra le scansioni"
         },
-        "step": {
-            "user": {
-                "data": {
-                    "password": "Password",
-                    "email": "Indirizzo email",
-                    "url": "Regione del dominio Amazon (e.g., amazon.it)",
-                    "include_devices": "Dispositivi da includere (separati da virgola)",
-                    "exclude_devices": "Dispositivi da escludere (separati da virgola)",
-                    "debug": "Debug avanzato",
-                    "scan_interval": "Tempo in secondi fra le scansioni"
-                },
-                "description": "Prego inserisci le tue informazioni.",
-                "title": "Alexa Media Player - Configurazione"
-            },
-            "captcha": {
-                "data": {
-                    "password": "Password",
-                    "captcha": "Captcha"
-                },
-                "description": "**{email} - alexa.{url}**\n{message}\n {captcha_image}",
-                "title": "Alexa Media Player - Captcha"
-            },
-            "twofactor": {
-                "data": {
-                    "securitycode": "Codice autenticazione a 2 fattori (2FA)"
-                },
-                "description": "**{email} - alexa.{url}**\nInserisci la password usa e getta (OTP).\n{message}",
-                "title": "Alexa Media Player - Autenticazione a Due Fattori"
-            },
-            "authselect": {
-                "data": {
-                    "authselectoption": "Metodo password usa e getta (OTP)"
-                },
-                "description": "**{email} - alexa.{url}**\n{message}",
-                "title": "Alexa Media Player - Password Usa e Getta (One Time Password)"
-            },
-            "claimspicker": {
-                "data": {
-                    "authselectoption": "Metodi di Verifica"
-                },
-                "description": "**{email} - alexa.{url}**\nPrego selezionare un metodo di verifica. (e.g., `sms` or `email`)\n{message}",
-                "title": "Alexa Media Player - Metodi di Verifica"
-            }
-
+        "description": "Prego inserisci le tue informazioni.",
+        "title": "Alexa Media Player - Configurazione"
+      },
+      "captcha": {
+        "data": {
+          "password": "Password",
+          "captcha": "Captcha"
         },
-        "title": "Alexa Media Player"
-    }
+        "description": "**{email} - alexa.{url}**\n{message}\n {captcha_image}",
+        "title": "Alexa Media Player - Captcha"
+      },
+      "twofactor": {
+        "data": {
+          "securitycode": "Codice autenticazione a 2 fattori (2FA)"
+        },
+        "description": "**{email} - alexa.{url}**\nInserisci la password usa e getta (OTP).\n{message}",
+        "title": "Alexa Media Player - Autenticazione a Due Fattori"
+      },
+      "authselect": {
+        "data": {
+          "authselectoption": "Metodo password usa e getta (OTP)"
+        },
+        "description": "**{email} - alexa.{url}**\n{message}",
+        "title": "Alexa Media Player - Password Usa e Getta (One Time Password)"
+      },
+      "claimspicker": {
+        "data": {
+          "authselectoption": "Metodi di Verifica"
+        },
+        "description": "**{email} - alexa.{url}**\nPrego selezionare un metodo di verifica. (e.g., `0` or `1`)\n{message}",
+        "title": "Alexa Media Player - Metodi di Verifica"
+      }
+    },
+    "title": "Alexa Media Player"
+  }
 }