Merge pull request #876 from custom-components/dev

2020-08-22
alandtse · Aug 23, 2020 · d0dd3b0 · d0dd3b0
2 parents d72e5b1 + 590070c
commit d0dd3b0
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 9 deletions.
diff --git a/custom_components/alexa_media/.translations/en.json b/custom_components/alexa_media/.translations/en.json
@@ -54,7 +54,10 @@
         "title": "Alexa Media Player - Action Required"
       }
     },
-    "title": "Alexa Media Player"
+    "abort": {
+      "forgot_password": "The Forgot Password page was detected. This normally is the result of too may failed logins. Amazon may require action before a relogin can be attempted.",
+      "login_failed": "Alexa Media Player failed to login."
+    }
   },
   "options": {
     "step": {

diff --git a/custom_components/alexa_media/__init__.py b/custom_components/alexa_media/__init__.py
@@ -311,10 +311,14 @@ async def async_update_data():
                 login_obj.status,
             )
             if login_obj.status:
-                await hass.bus.async_fire(
+                hass.bus.async_fire(
                     "alexa_media_player/relogin_required",
                     event_data={"email": hide_email(email), "url": login_obj.url},
                 )
+                hass.bus.async_fire(
+                    "alexa_media_player_relogin_required",
+                    event_data={"email": hide_email(email), "url": login_obj.url},
+                )
                 await login_obj.reset()
                 await login_obj.login()
                 await test_login_status(hass, config_entry, login_obj, setup_alexa)

diff --git a/custom_components/alexa_media/config_flow.py b/custom_components/alexa_media/config_flow.py
@@ -316,8 +316,9 @@ async def _test_login(self):
                 },
             )
         if login.status and login.status.get("login_failed"):
-            _LOGGER.debug("Login failed")
-            return self.async_abort(reason="Login failed")
+            _LOGGER.debug("Login failed: %s", login.status.get("login_failed"))
+            await login.close()
+            return self.async_abort(reason=login.status.get("login_failed"),)
         new_schema = self._update_ord_dict(
             self.data_schema,
             {

diff --git a/custom_components/alexa_media/manifest.json b/custom_components/alexa_media/manifest.json
@@ -6,5 +6,5 @@
   "issue_tracker": "https://github.com/custom-components/alexa_media_player/issues",
   "dependencies": ["configurator"],
   "codeowners": ["@keatontaylor", "@alandtse"],
-  "requirements": ["alexapy==1.12.1"]
+  "requirements": ["alexapy==1.12.2"]
 }
diff --git a/custom_components/alexa_media/sensor.py b/custom_components/alexa_media/sensor.py
@@ -11,12 +11,17 @@
 import logging
 from typing import List, Text  # noqa pylint: disable=unused-import
 
-from homeassistant.const import DEVICE_CLASS_TIMESTAMP, STATE_UNAVAILABLE
+from homeassistant.const import (
+    DEVICE_CLASS_TIMESTAMP,
+    STATE_UNAVAILABLE,
+    __version__ as HA_VERSION,
+)
 from homeassistant.exceptions import ConfigEntryNotReady, NoEntitySpecifiedError
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import dt
 import pytz
+import semver
 
 from . import (
     CONF_EMAIL,
@@ -419,7 +424,14 @@ def __init__(self, client, n_json, account):
         # Class info
         self._type = "Timer"
         super().__init__(
-            client, n_json, "remainingTime", account, f"next {self._type}", "mdi:timer"
+            client,
+            n_json,
+            "remainingTime",
+            account,
+            f"next {self._type}",
+            "mdi:timer-outline"
+            if semver.compare(HA_VERSION, "0.113.0") >= 0
+            else "mdi:timer",
         )
 
     @property
@@ -449,7 +461,12 @@ def paused(self) -> bool:
     @property
     def icon(self):
         """Return the icon of the sensor."""
-        return self._icon if not self.paused else "mdi:timer-off"
+        off_icon = (
+            "mdi:timer-off-outline"
+            if (semver.compare(HA_VERSION, "0.113.0") >= 0)
+            else "mdi:timer-off"
+        )
+        return self._icon if not self.paused else off_icon
 
 
 class ReminderSensor(AlexaMediaNotificationSensor):

diff --git a/custom_components/alexa_media/strings.json b/custom_components/alexa_media/strings.json
@@ -54,7 +54,10 @@
         "title": "Alexa Media Player - Action Required"
       }
     },
-    "title": "Alexa Media Player"
+    "abort": {
+      "forgot_password": "The Forgot Password page was detected. Amazon may require action before a relogin can be attempted.",
+      "login_failed": "Alexa Media Player failed to login."
+    }
   },
   "options": {
     "step": {