(.+?)
', - response.text) + mpchc_variables = re.findall( + r'(.+?)
', response.text) - self._player_variables = dict() for var in mpchc_variables: self._player_variables[var[0]] = var[1].lower() except requests.exceptions.RequestException: diff --git a/homeassistant/components/media_player/nad.py b/homeassistant/components/media_player/nad.py index 6f2b9ac4a71..43355782d29 100644 --- a/homeassistant/components/media_player/nad.py +++ b/homeassistant/components/media_player/nad.py @@ -56,7 +56,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): config.get(CONF_MIN_VOLUME), config.get(CONF_MAX_VOLUME), config.get(CONF_SOURCE_DICT) - )]) + )], True) class NAD(MediaPlayerDevice): @@ -73,12 +73,7 @@ class NAD(MediaPlayerDevice): self._reverse_mapping = {value: key for key, value in self._source_dict.items()} - self._volume = None - self._state = None - self._mute = None - self._source = None - - self.update() + self._volume = self._state = self._mute = self._source = None def calc_volume(self, decibel): """ diff --git a/homeassistant/components/media_player/nadtcp.py b/homeassistant/components/media_player/nadtcp.py index 0b04f173c48..a59a032f624 100644 --- a/homeassistant/components/media_player/nadtcp.py +++ b/homeassistant/components/media_player/nadtcp.py @@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): config.get(CONF_MIN_VOLUME), config.get(CONF_MAX_VOLUME), config.get(CONF_VOLUME_STEP), - )]) + )], True) class NADtcp(MediaPlayerDevice): @@ -70,8 +70,6 @@ class NADtcp(MediaPlayerDevice): self._source = None self._source_list = self.nad_device.available_sources() - self.update() - @property def name(self): """Return the name of the device.""" diff --git a/homeassistant/components/media_player/onkyo.py b/homeassistant/components/media_player/onkyo.py index 19c46b811f7..927de799ae9 100644 --- a/homeassistant/components/media_player/onkyo.py +++ b/homeassistant/components/media_player/onkyo.py @@ -61,7 +61,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): if receiver.host not in KNOWN_HOSTS: hosts.append(OnkyoDevice(receiver, config.get(CONF_SOURCES))) KNOWN_HOSTS.append(receiver.host) - add_devices(hosts) + add_devices(hosts, True) class OnkyoDevice(MediaPlayerDevice): @@ -79,7 +79,6 @@ class OnkyoDevice(MediaPlayerDevice): self._source_list = list(sources.values()) self._source_mapping = sources self._reverse_mapping = {value: key for key, value in sources.items()} - self.update() def command(self, command): """Run an eiscp command and catch connection errors.""" diff --git a/homeassistant/components/media_player/yamaha.py b/homeassistant/components/media_player/yamaha.py index 4d10c722800..f2e64b1fb25 100644 --- a/homeassistant/components/media_player/yamaha.py +++ b/homeassistant/components/media_player/yamaha.py @@ -67,9 +67,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): _LOGGER.info("%s already manually configured", ctrl_url) return receivers = rxv.RXV( - ctrl_url, - model_name=model, - friendly_name=name, + ctrl_url, model_name=model, friendly_name=name, unit_desc_url=desc_url).zone_controllers() _LOGGER.info("Receivers: %s", receivers) # when we are dynamically discovered config is empty @@ -86,7 +84,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None): if receiver.zone not in zone_ignore: hass.data[KNOWN].add(receiver.ctrl_url) add_devices([ - YamahaDevice(name, receiver, source_ignore, source_names)]) + YamahaDevice(name, receiver, source_ignore, source_names) + ], True) class YamahaDevice(MediaPlayerDevice): @@ -106,7 +105,6 @@ class YamahaDevice(MediaPlayerDevice): self._playback_support = None self._is_playback_supported = False self._play_status = None - self.update() self._name = name self._zone = receiver.zone diff --git a/homeassistant/components/sensor/apcupsd.py b/homeassistant/components/sensor/apcupsd.py index 0ddf6f160ae..897f0626b7c 100644 --- a/homeassistant/components/sensor/apcupsd.py +++ b/homeassistant/components/sensor/apcupsd.py @@ -123,7 +123,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None): entities.append(APCUPSdSensor(apcupsd.DATA, sensor_type)) - add_entities(entities) + add_entities(entities, True) def infer_unit(value): @@ -149,7 +149,7 @@ class APCUPSdSensor(Entity): self._name = SENSOR_PREFIX + SENSOR_TYPES[sensor_type][0] self._unit = SENSOR_TYPES[sensor_type][1] self._inferred_unit = None - self.update() + self._state = None @property def name(self): diff --git a/homeassistant/components/sensor/fritzbox_netmonitor.py b/homeassistant/components/sensor/fritzbox_netmonitor.py index 003307fbd83..1b7d2398efc 100644 --- a/homeassistant/components/sensor/fritzbox_netmonitor.py +++ b/homeassistant/components/sensor/fritzbox_netmonitor.py @@ -46,12 +46,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ def setup_platform(hass, config, add_devices, discovery_info=None): - """Set up the fritzbox monitor sensors.""" + """Set up the FRITZ!Box monitor sensors.""" # pylint: disable=import-error import fritzconnection as fc from fritzconnection.fritzconnection import FritzConnectionException - host = config[CONF_HOST] + host = config.get(CONF_HOST) try: fstatus = fc.FritzStatus(address=host) @@ -59,15 +59,12 @@ def setup_platform(hass, config, add_devices, discovery_info=None): fstatus = None if fstatus is None: - _LOGGER.error('Failed to establish connection to FRITZ!Box ' - 'with IP: %s', host) + _LOGGER.error("Failed to establish connection to FRITZ!Box: %s", host) return 1 else: - _LOGGER.info('Successfully connected to FRITZ!Box') + _LOGGER.info("Successfully connected to FRITZ!Box") - sensor = FritzboxMonitorSensor(fstatus) - devices = [sensor] - add_devices(devices) + add_devices([FritzboxMonitorSensor(fstatus)], True) class FritzboxMonitorSensor(Entity): @@ -78,7 +75,10 @@ class FritzboxMonitorSensor(Entity): self._name = 'fritz_netmonitor' self._fstatus = fstatus self._state = STATE_UNAVAILABLE - self.update() + self._is_linked = self._is_connected = self._wan_access_type = None + self._external_ip = self._uptime = None + self._bytes_sent = self._bytes_received = None + self._max_byte_rate_up = self._max_byte_rate_down = None @property def name(self): @@ -130,4 +130,4 @@ class FritzboxMonitorSensor(Entity): self._state = STATE_ONLINE if self._is_connected else STATE_OFFLINE except RequestException as err: self._state = STATE_UNAVAILABLE - _LOGGER.warning('Could not reach Fritzbox: %s', err) + _LOGGER.warning("Could not reach FRITZ!Box: %s", err) diff --git a/homeassistant/components/sensor/google_travel_time.py b/homeassistant/components/sensor/google_travel_time.py index 0e495c67817..07c46b1a3d2 100644 --- a/homeassistant/components/sensor/google_travel_time.py +++ b/homeassistant/components/sensor/google_travel_time.py @@ -109,8 +109,8 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None): origin = config.get(CONF_ORIGIN) destination = config.get(CONF_DESTINATION) - sensor = GoogleTravelTimeSensor(hass, name, api_key, origin, - destination, options) + sensor = GoogleTravelTimeSensor( + hass, name, api_key, origin, destination, options) if sensor.valid_api_connection: add_devices_callback([sensor]) diff --git a/homeassistant/components/sensor/influxdb.py b/homeassistant/components/sensor/influxdb.py index 5aad96965c9..7c7ce3ec3da 100644 --- a/homeassistant/components/sensor/influxdb.py +++ b/homeassistant/components/sensor/influxdb.py @@ -67,12 +67,14 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60) def setup_platform(hass, config, add_devices, discovery_info=None): """Set up the InfluxDB component.""" - influx_conf = {'host': config[CONF_HOST], - 'port': config.get(CONF_PORT), - 'username': config.get(CONF_USERNAME), - 'password': config.get(CONF_PASSWORD), - 'ssl': config.get(CONF_SSL), - 'verify_ssl': config.get(CONF_VERIFY_SSL)} + influx_conf = { + 'host': config[CONF_HOST], + 'password': config.get(CONF_PASSWORD), + 'port': config.get(CONF_PORT), + 'ssl': config.get(CONF_SSL), + 'username': config.get(CONF_USERNAME), + 'verify_ssl': config.get(CONF_VERIFY_SSL), + } dev = [] @@ -81,7 +83,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): if sensor.connected: dev.append(sensor) - add_devices(dev) + add_devices(dev, True) class InfluxSensor(Entity): @@ -113,12 +115,9 @@ class InfluxSensor(Entity): try: influx.query("select * from /.*/ LIMIT 1;") self.connected = True - self.data = InfluxSensorData(influx, - query.get(CONF_GROUP_FUNCTION), - query.get(CONF_FIELD), - query.get(CONF_MEASUREMENT_NAME), - where_clause) - self.update() + self.data = InfluxSensorData( + influx, query.get(CONF_GROUP_FUNCTION), query.get(CONF_FIELD), + query.get(CONF_MEASUREMENT_NAME), where_clause) except exceptions.InfluxDBClientError as exc: _LOGGER.error("Database host is not accessible due to '%s', please" " check your entries in the configuration file and" @@ -146,7 +145,7 @@ class InfluxSensor(Entity): return True def update(self): - """Get the latest data from influxdb and updates the states.""" + """Get the latest data from Influxdb and updates the states.""" self.data.update() value = self.data.value if value is None: @@ -178,14 +177,11 @@ class InfluxSensorData(object): try: where_clause = self.where.render() except TemplateError as ex: - _LOGGER.error('Could not render where clause template: %s', ex) + _LOGGER.error("Could not render where clause template: %s", ex) return - self.query = "select {}({}) as value from {} where {}"\ - .format(self.group, - self.field, - self.measurement, - where_clause) + self.query = "select {}({}) as value from {} where {}".format( + self.group, self.field, self.measurement, where_clause) _LOGGER.info("Running query: %s", self.query) diff --git a/homeassistant/components/sensor/onewire.py b/homeassistant/components/sensor/onewire.py index a06573fe97f..5cbbe6ed0aa 100644 --- a/homeassistant/components/sensor/onewire.py +++ b/homeassistant/components/sensor/onewire.py @@ -8,10 +8,12 @@ import os import time import logging from glob import glob + import voluptuous as vol -from homeassistant.helpers.entity import Entity + import homeassistant.helpers.config_validation as cv -from homeassistant.const import STATE_UNKNOWN, TEMP_CELSIUS +from homeassistant.helpers.entity import Entity +from homeassistant.const import TEMP_CELSIUS from homeassistant.components.sensor import PLATFORM_SCHEMA _LOGGER = logging.getLogger(__name__) @@ -61,21 +63,21 @@ def setup_platform(hass, config, add_devices, discovery_info=None): names = sensor_ids for key in config.keys(): - if key == "names": - # only one name given + if key == 'names': + # Only one name given if isinstance(config['names'], str): names = [config['names']] - # map names and sensors in given order + # Map names and sensors in given order elif isinstance(config['names'], list): names = config['names'] - # map names to ids. + # Map names to ids. elif isinstance(config['names'], dict): names = [] for sensor_id in sensor_ids: names.append(config['names'].get(sensor_id, sensor_id)) for device_file, name in zip(device_files, names): devs.append(OneWire(name, device_file)) - add_devices(devs) + add_devices(devs, True) class OneWire(Entity): @@ -85,8 +87,7 @@ class OneWire(Entity): """Initialize the sensor.""" self._name = name self._device_file = device_file - self._state = STATE_UNKNOWN - self.update() + self._state = None def _read_temp_raw(self): """Read the temperature as it is returned by the sensor.""" diff --git a/homeassistant/components/sensor/plex.py b/homeassistant/components/sensor/plex.py index eb6b5f49f6a..1077c7462d2 100644 --- a/homeassistant/components/sensor/plex.py +++ b/homeassistant/components/sensor/plex.py @@ -49,7 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): plex_url = 'http://{}:{}'.format(plex_host, plex_port) add_devices([PlexSensor( - name, plex_url, plex_user, plex_password, plex_server)]) + name, plex_url, plex_user, plex_password, plex_server)], True) class PlexSensor(Entity): @@ -73,8 +73,6 @@ class PlexSensor(Entity): else: self._server = PlexServer(plex_url) - self.update() - @property def name(self): """Return the name of the sensor.""" diff --git a/homeassistant/components/sensor/sensehat.py b/homeassistant/components/sensor/sensehat.py index 7a759351b35..db6d931d1b2 100644 --- a/homeassistant/components/sensor/sensehat.py +++ b/homeassistant/components/sensor/sensehat.py @@ -65,7 +65,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): for variable in config[CONF_DISPLAY_OPTIONS]: dev.append(SenseHatSensor(data, variable)) - add_devices(dev) + add_devices(dev, True) class SenseHatSensor(Entity): @@ -78,7 +78,6 @@ class SenseHatSensor(Entity): self._unit_of_measurement = SENSOR_TYPES[sensor_types][1] self.type = sensor_types self._state = None - self.update() @property def name(self): diff --git a/homeassistant/components/sensor/steam_online.py b/homeassistant/components/sensor/steam_online.py index 9fd5ab7dd7d..27dd2fad56f 100644 --- a/homeassistant/components/sensor/steam_online.py +++ b/homeassistant/components/sensor/steam_online.py @@ -21,12 +21,6 @@ CONF_ACCOUNTS = 'accounts' ICON = 'mdi:steam' -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ - vol.Required(CONF_API_KEY): cv.string, - vol.Required(CONF_ACCOUNTS, default=[]): - vol.All(cv.ensure_list, [cv.string]), -}) - STATE_ONLINE = 'Online' STATE_BUSY = 'Busy' STATE_AWAY = 'Away' @@ -34,6 +28,12 @@ STATE_SNOOZE = 'Snooze' STATE_TRADE = 'Trade' STATE_PLAY = 'Play' +PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ + vol.Required(CONF_API_KEY): cv.string, + vol.Required(CONF_ACCOUNTS, default=[]): + vol.All(cv.ensure_list, [cv.string]), +}) + # pylint: disable=unused-argument def setup_platform(hass, config, add_devices, discovery_info=None): @@ -42,7 +42,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): steamod.api.key.set(config.get(CONF_API_KEY)) add_devices( [SteamSensor(account, - steamod) for account in config.get(CONF_ACCOUNTS)]) + steamod) for account in config.get(CONF_ACCOUNTS)], True) class SteamSensor(Entity): @@ -52,7 +52,8 @@ class SteamSensor(Entity): """Initialize the sensor.""" self._steamod = steamod self._account = account - self.update() + self._profile = None + self._game = self._state = self._name = self._avatar = None @property def name(self): @@ -90,10 +91,7 @@ class SteamSensor(Entity): self._avatar = self._profile.avatar_medium except self._steamod.api.HTTPTimeoutError as error: _LOGGER.warning(error) - self._game = 'Unknown' - self._state = 'Unknown' - self._name = 'Unknown' - self._avatar = None + self._game = self._state = self._name = self._avatar = None @property def device_state_attributes(self): diff --git a/homeassistant/components/sensor/swiss_hydrological_data.py b/homeassistant/components/sensor/swiss_hydrological_data.py index 3e2f228423b..63d500e2373 100644 --- a/homeassistant/components/sensor/swiss_hydrological_data.py +++ b/homeassistant/components/sensor/swiss_hydrological_data.py @@ -67,7 +67,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): return False data = HydrologicalData(station) - add_devices([SwissHydrologicalDataSensor(name, data)]) + add_devices([SwissHydrologicalDataSensor(name, data)], True) class SwissHydrologicalDataSensor(Entity): @@ -78,7 +78,7 @@ class SwissHydrologicalDataSensor(Entity): self.data = data self._name = name self._unit_of_measurement = TEMP_CELSIUS - self.update() + self._state = None @property def name(self): diff --git a/homeassistant/components/sensor/ups.py b/homeassistant/components/sensor/ups.py index 2b2ae6172d0..40d84fe2618 100644 --- a/homeassistant/components/sensor/ups.py +++ b/homeassistant/components/sensor/ups.py @@ -52,7 +52,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): return False add_devices([UPSSensor(session, config.get(CONF_NAME), - config.get(CONF_UPDATE_INTERVAL))]) + config.get(CONF_UPDATE_INTERVAL))], True) class UPSSensor(Entity): @@ -65,7 +65,6 @@ class UPSSensor(Entity): self._attributes = None self._state = None self.update = Throttle(interval)(self._update) - self.update() @property def name(self): diff --git a/homeassistant/components/switch/acer_projector.py b/homeassistant/components/switch/acer_projector.py index 416f6431ba5..f32829b0633 100644 --- a/homeassistant/components/switch/acer_projector.py +++ b/homeassistant/components/switch/acer_projector.py @@ -37,13 +37,15 @@ LAMP_HOURS = 'Lamp Hours' MODEL = 'Model' # Commands known to the projector -CMD_DICT = {LAMP: '* 0 Lamp ?\r', - LAMP_HOURS: '* 0 Lamp\r', - INPUT_SOURCE: '* 0 Src ?\r', - ECO_MODE: '* 0 IR 052\r', - MODEL: '* 0 IR 035\r', - STATE_ON: '* 0 IR 001\r', - STATE_OFF: '* 0 IR 002\r'} +CMD_DICT = { + LAMP: '* 0 Lamp ?\r', + LAMP_HOURS: '* 0 Lamp\r', + INPUT_SOURCE: '* 0 Src ?\r', + ECO_MODE: '* 0 IR 052\r', + MODEL: '* 0 IR 035\r', + STATE_ON: '* 0 IR 001\r', + STATE_OFF: '* 0 IR 002\r', +} PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ @@ -62,7 +64,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): timeout = config.get(CONF_TIMEOUT) write_timeout = config.get(CONF_WRITE_TIMEOUT) - add_devices([AcerSwitch(serial_port, name, timeout, write_timeout)]) + add_devices([AcerSwitch(serial_port, name, timeout, write_timeout)], True) class AcerSwitch(SwitchDevice): @@ -83,7 +85,6 @@ class AcerSwitch(SwitchDevice): INPUT_SOURCE: STATE_UNKNOWN, ECO_MODE: STATE_UNKNOWN, } - self.update() def _write_read(self, msg): """Write to the projector and read the return.""" diff --git a/homeassistant/components/switch/digitalloggers.py b/homeassistant/components/switch/digitalloggers.py index dabd8ea1d2d..26493122184 100755 --- a/homeassistant/components/switch/digitalloggers.py +++ b/homeassistant/components/switch/digitalloggers.py @@ -19,7 +19,6 @@ REQUIREMENTS = ['dlipower==0.7.165'] _LOGGER = logging.getLogger(__name__) - CONF_CYCLETIME = 'cycletime' DEFAULT_NAME = 'DINRelay' @@ -59,7 +58,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): ) if not power_switch.verify(): - _LOGGER.error('Could not connect to DIN III Relay') + _LOGGER.error("Could not connect to DIN III Relay") return False devices = [] @@ -70,7 +69,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): for device in power_switch ) - add_devices(devices) + add_devices(devices, True) class DINRelay(SwitchDevice): @@ -81,7 +80,8 @@ class DINRelay(SwitchDevice): self._parent_device = parent_device self.controllername = name self.outletnumber = outletnumber - self.update() + self._outletname = '' + self._is_on = False @property def name(self): @@ -112,7 +112,7 @@ class DINRelay(SwitchDevice): self._is_on = ( self._parent_device.statuslocal[self.outletnumber - 1][2] == 'ON' ) - self._outletname = "{}_{}".format( + self._outletname = '{}_{}'.format( self.controllername, self._parent_device.statuslocal[self.outletnumber - 1][1] ) @@ -124,7 +124,7 @@ class DINRelayDevice(object): def __init__(self, device): """Initialize the DINRelay device.""" self._device = device - self.update() + self.statuslocal = None def turn_on(self, **kwargs): """Instruct the relay to turn on.""" diff --git a/homeassistant/components/switch/litejet.py b/homeassistant/components/switch/litejet.py index 87a82ed67f2..1e7c46733ad 100644 --- a/homeassistant/components/switch/litejet.py +++ b/homeassistant/components/switch/litejet.py @@ -25,7 +25,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): name = litejet_.get_switch_name(i) if not litejet.is_ignored(hass, name): devices.append(LiteJetSwitch(hass, litejet_, i, name)) - add_devices(devices) + add_devices(devices, True) class LiteJetSwitch(SwitchDevice): @@ -42,8 +42,6 @@ class LiteJetSwitch(SwitchDevice): lj.on_switch_pressed(i, self._on_switch_pressed) lj.on_switch_released(i, self._on_switch_released) - self.update() - def _on_switch_pressed(self): _LOGGER.debug("Updating pressed for %s", self._name) self._state = True diff --git a/homeassistant/components/switch/wake_on_lan.py b/homeassistant/components/switch/wake_on_lan.py index c5928ab1809..d94ff8c268b 100644 --- a/homeassistant/components/switch/wake_on_lan.py +++ b/homeassistant/components/switch/wake_on_lan.py @@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): off_action = config.get(CONF_OFF_ACTION) add_devices([WOLSwitch(hass, name, host, mac_address, - off_action, broadcast_address)]) + off_action, broadcast_address)], True) class WOLSwitch(SwitchDevice): @@ -62,7 +62,6 @@ class WOLSwitch(SwitchDevice): self._off_script = Script(hass, off_action) if off_action else None self._state = False self._wol = wol - self.update() @property def should_poll(self):