diff --git a/homeassistant/components/epson/__init__.py b/homeassistant/components/epson/__init__.py index 0e0cf8fb247..c7278ed2cc9 100644 --- a/homeassistant/components/epson/__init__.py +++ b/homeassistant/components/epson/__init__.py @@ -3,11 +3,11 @@ import asyncio import logging from epson_projector import Projector -from epson_projector.const import POWER +from epson_projector.const import POWER, STATE_UNAVAILABLE as EPSON_STATE_UNAVAILABLE from homeassistant.components.media_player import DOMAIN as MEDIA_PLAYER_PLATFORM from homeassistant.config_entries import ConfigEntry -from homeassistant.const import CONF_HOST, CONF_PORT, STATE_UNAVAILABLE +from homeassistant.const import CONF_HOST, CONF_PORT from homeassistant.core import HomeAssistant from homeassistant.helpers.aiohttp_client import async_get_clientsession @@ -27,7 +27,7 @@ async def validate_projector(hass: HomeAssistant, host, port): port=port, ) _power = await epson_proj.get_property(POWER) - if not _power or _power == STATE_UNAVAILABLE: + if not _power or _power == EPSON_STATE_UNAVAILABLE: raise CannotConnect return epson_proj diff --git a/homeassistant/components/epson/config_flow.py b/homeassistant/components/epson/config_flow.py index 516ea1402b5..6f6d7b2247f 100644 --- a/homeassistant/components/epson/config_flow.py +++ b/homeassistant/components/epson/config_flow.py @@ -35,11 +35,12 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): await validate_projector( self.hass, user_input[CONF_HOST], user_input[CONF_PORT] ) + except CannotConnect: + errors["base"] = "cannot_connect" + else: return self.async_create_entry( title=user_input.pop(CONF_NAME), data=user_input ) - except CannotConnect: - errors["base"] = "cannot_connect" return self.async_show_form( step_id="user", data_schema=DATA_SCHEMA, errors=errors ) diff --git a/homeassistant/components/epson/manifest.json b/homeassistant/components/epson/manifest.json index 90f4baf24d2..809bcf1d651 100644 --- a/homeassistant/components/epson/manifest.json +++ b/homeassistant/components/epson/manifest.json @@ -1,6 +1,6 @@ { "domain": "epson", - "name": "epson", + "name": "Epson", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/epson", "requirements": ["epson-projector==0.2.3"], diff --git a/homeassistant/components/epson/media_player.py b/homeassistant/components/epson/media_player.py index c7e4b4faed8..62260183509 100644 --- a/homeassistant/components/epson/media_player.py +++ b/homeassistant/components/epson/media_player.py @@ -17,6 +17,7 @@ from epson_projector.const import ( POWER, SOURCE, SOURCE_LIST, + STATE_UNAVAILABLE as EPSON_STATE_UNAVAILABLE, TURN_OFF, TURN_ON, VOL_DOWN, @@ -84,7 +85,6 @@ async def async_setup_entry(hass, config_entry, async_add_entities): {vol.Required(ATTR_CMODE): vol.All(cv.string, vol.Any(*CMODE_LIST_SET))}, SERVICE_SELECT_CMODE, ) - return True async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): @@ -128,7 +128,7 @@ class EpsonProjectorMediaPlayer(MediaPlayerEntity): self._volume = volume elif power_state == BUSY: self._state = STATE_ON - elif power_state == STATE_UNAVAILABLE: + elif power_state == EPSON_STATE_UNAVAILABLE: self._state = STATE_UNAVAILABLE else: self._state = STATE_OFF diff --git a/homeassistant/components/epson/strings.json b/homeassistant/components/epson/strings.json index 358e3549f85..15147b6730f 100644 --- a/homeassistant/components/epson/strings.json +++ b/homeassistant/components/epson/strings.json @@ -12,9 +12,6 @@ }, "error": { "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]" - }, - "abort": { - "already_configured": "[%key:common::config_flow::abort::already_configured_device%]" } } } \ No newline at end of file