evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Various updates (#19449)

Browse source 
* Various updates

* Fix lint issues
This commit is contained in:
Fabian Affolter 2018-12-19 12:39:16 +01:00 • committed by GitHub
parent 258fe1f09b
commit 8cec559103
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 68 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

114
homeassistant/components/ihc/__init__.py
View file

@ -9,8 +9,8 @@ import os.path
import xml.etree.ElementTree import xml.etree.ElementTree
import voluptuous as vol import voluptuous as vol
from homeassistant.components.binary_sensor import (
DEVICE_CLASSES_SCHEMA) from homeassistant.components.binary_sensor import DEVICE_CLASSES_SCHEMA
from homeassistant.components.ihc.const import ( from homeassistant.components.ihc.const import (
ATTR_IHC_ID, ATTR_VALUE, CONF_AUTOSETUP, CONF_BINARY_SENSOR, CONF_DIMMABLE, ATTR_IHC_ID, ATTR_VALUE, CONF_AUTOSETUP, CONF_BINARY_SENSOR, CONF_DIMMABLE,
CONF_INFO, CONF_INVERTING, CONF_LIGHT, CONF_NODE, CONF_NOTE, CONF_POSITION, CONF_INFO, CONF_INVERTING, CONF_LIGHT, CONF_NODE, CONF_NOTE, CONF_POSITION,
@ -18,24 +18,28 @@ from homeassistant.components.ihc.const import (
SERVICE_SET_RUNTIME_VALUE_FLOAT, SERVICE_SET_RUNTIME_VALUE_INT) SERVICE_SET_RUNTIME_VALUE_FLOAT, SERVICE_SET_RUNTIME_VALUE_INT)
from homeassistant.config import load_yaml_config_file from homeassistant.config import load_yaml_config_file
from homeassistant.const import ( from homeassistant.const import (
CONF_ID, CONF_NAME, CONF_PASSWORD, CONF_ID, CONF_NAME, CONF_PASSWORD, CONF_TYPE, CONF_UNIT_OF_MEASUREMENT,
CONF_TYPE, CONF_UNIT_OF_MEASUREMENT, CONF_URL, CONF_URL, CONF_USERNAME, TEMP_CELSIUS)
CONF_USERNAME, TEMP_CELSIUS)
from homeassistant.helpers import discovery from homeassistant.helpers import discovery
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.typing import HomeAssistantType from homeassistant.helpers.typing import HomeAssistantType
REQUIREMENTS = ['ihcsdk==2.2.0'] REQUIREMENTS = ['ihcsdk==2.2.0']
DOMAIN = 'ihc' _LOGGER = logging.getLogger(__name__)
IHC_DATA = 'ihc{}'
IHC_CONTROLLER = 'controller'
IHC_INFO = 'info'
AUTO_SETUP_YAML = 'ihc_auto_setup.yaml' AUTO_SETUP_YAML = 'ihc_auto_setup.yaml'
DOMAIN = 'ihc'
IHC_CONTROLLER = 'controller'
IHC_DATA = 'ihc{}'
IHC_INFO = 'info'
IHC_PLATFORMS = ('binary_sensor', 'light', 'sensor', 'switch')
def validate_name(config): def validate_name(config):
"""Validate device name.""" """Validate the device name."""
if CONF_NAME in config: if CONF_NAME in config:
return config return config
ihcid = config[CONF_ID] ihcid = config[CONF_ID]
@ -47,17 +51,16 @@ def validate_name(config):
DEVICE_SCHEMA = vol.Schema({ DEVICE_SCHEMA = vol.Schema({
vol.Required(CONF_ID): cv.positive_int, vol.Required(CONF_ID): cv.positive_int,
vol.Optional(CONF_NAME): cv.string, vol.Optional(CONF_NAME): cv.string,
vol.Optional(CONF_NOTE): cv.string,
vol.Optional(CONF_POSITION): cv.string, vol.Optional(CONF_POSITION): cv.string,
vol.Optional(CONF_NOTE): cv.string
}) })
SWITCH_SCHEMA = DEVICE_SCHEMA.extend({ SWITCH_SCHEMA = DEVICE_SCHEMA.extend({})
})
BINARY_SENSOR_SCHEMA = DEVICE_SCHEMA.extend({ BINARY_SENSOR_SCHEMA = DEVICE_SCHEMA.extend({
vol.Optional(CONF_TYPE): DEVICE_CLASSES_SCHEMA,
vol.Optional(CONF_INVERTING, default=False): cv.boolean, vol.Optional(CONF_INVERTING, default=False): cv.boolean,
vol.Optional(CONF_TYPE): DEVICE_CLASSES_SCHEMA,
}) })
LIGHT_SCHEMA = DEVICE_SCHEMA.extend({ LIGHT_SCHEMA = DEVICE_SCHEMA.extend({
@ -65,47 +68,28 @@ LIGHT_SCHEMA = DEVICE_SCHEMA.extend({
}) })
SENSOR_SCHEMA = DEVICE_SCHEMA.extend({ SENSOR_SCHEMA = DEVICE_SCHEMA.extend({
vol.Optional(CONF_UNIT_OF_MEASUREMENT, vol.Optional(CONF_UNIT_OF_MEASUREMENT, default=TEMP_CELSIUS): cv.string,
default=TEMP_CELSIUS): cv.string,
}) })
IHC_SCHEMA = vol.Schema({ IHC_SCHEMA = vol.Schema({
vol.Required(CONF_PASSWORD): cv.string,
vol.Required(CONF_URL): cv.string, vol.Required(CONF_URL): cv.string,
vol.Required(CONF_USERNAME): cv.string, vol.Required(CONF_USERNAME): cv.string,
vol.Required(CONF_PASSWORD): cv.string,
vol.Optional(CONF_AUTOSETUP, default=True): cv.boolean, vol.Optional(CONF_AUTOSETUP, default=True): cv.boolean,
vol.Optional(CONF_INFO, default=True): cv.boolean,
vol.Optional(CONF_BINARY_SENSOR, default=[]): vol.Optional(CONF_BINARY_SENSOR, default=[]):
vol.All(cv.ensure_list, [ vol.All(
vol.All( cv.ensure_list, [vol.All(BINARY_SENSOR_SCHEMA, validate_name)]),
BINARY_SENSOR_SCHEMA, vol.Optional(CONF_INFO, default=True): cv.boolean,
validate_name)
]),
vol.Optional(CONF_LIGHT, default=[]): vol.Optional(CONF_LIGHT, default=[]):
vol.All(cv.ensure_list, [ vol.All(cv.ensure_list, [vol.All(LIGHT_SCHEMA, validate_name)]),
vol.All(
LIGHT_SCHEMA,
validate_name)
]),
vol.Optional(CONF_SENSOR, default=[]): vol.Optional(CONF_SENSOR, default=[]):
vol.All(cv.ensure_list, [ vol.All(cv.ensure_list, [vol.All(SENSOR_SCHEMA, validate_name)]),
vol.All(
SENSOR_SCHEMA,
validate_name)
]),
vol.Optional(CONF_SWITCH, default=[]): vol.Optional(CONF_SWITCH, default=[]):
vol.All(cv.ensure_list, [ vol.All(cv.ensure_list, [vol.All(SWITCH_SCHEMA, validate_name)]),
vol.All(
SWITCH_SCHEMA,
validate_name)
]),
}) })
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({
DOMAIN: vol.Schema(vol.All( DOMAIN: vol.Schema(vol.All(cv.ensure_list, [IHC_SCHEMA])),
cv.ensure_list,
[IHC_SCHEMA]
)),
}, extra=vol.ALLOW_EXTRA) }, extra=vol.ALLOW_EXTRA)
@ -113,25 +97,25 @@ AUTO_SETUP_SCHEMA = vol.Schema({
vol.Optional(CONF_BINARY_SENSOR, default=[]): vol.Optional(CONF_BINARY_SENSOR, default=[]):
vol.All(cv.ensure_list, [ vol.All(cv.ensure_list, [
vol.All({ vol.All({
vol.Required(CONF_XPATH): cv.string,
vol.Required(CONF_NODE): cv.string, vol.Required(CONF_NODE): cv.string,
vol.Optional(CONF_TYPE): cv.string, vol.Required(CONF_XPATH): cv.string,
vol.Optional(CONF_INVERTING, default=False): cv.boolean, vol.Optional(CONF_INVERTING, default=False): cv.boolean,
vol.Optional(CONF_TYPE): cv.string,
}) })
]), ]),
vol.Optional(CONF_LIGHT, default=[]): vol.Optional(CONF_LIGHT, default=[]):
vol.All(cv.ensure_list, [ vol.All(cv.ensure_list, [
vol.All({ vol.All({
vol.Required(CONF_XPATH): cv.string,
vol.Required(CONF_NODE): cv.string, vol.Required(CONF_NODE): cv.string,
vol.Required(CONF_XPATH): cv.string,
vol.Optional(CONF_DIMMABLE, default=False): cv.boolean, vol.Optional(CONF_DIMMABLE, default=False): cv.boolean,
}) })
]), ]),
vol.Optional(CONF_SENSOR, default=[]): vol.Optional(CONF_SENSOR, default=[]):
vol.All(cv.ensure_list, [ vol.All(cv.ensure_list, [
vol.All({ vol.All({
vol.Required(CONF_XPATH): cv.string,
vol.Required(CONF_NODE): cv.string, vol.Required(CONF_NODE): cv.string,
vol.Required(CONF_XPATH): cv.string,
vol.Optional(CONF_UNIT_OF_MEASUREMENT, vol.Optional(CONF_UNIT_OF_MEASUREMENT,
default=TEMP_CELSIUS): cv.string, default=TEMP_CELSIUS): cv.string,
}) })
@ -139,31 +123,27 @@ AUTO_SETUP_SCHEMA = vol.Schema({
vol.Optional(CONF_SWITCH, default=[]): vol.Optional(CONF_SWITCH, default=[]):
vol.All(cv.ensure_list, [ vol.All(cv.ensure_list, [
vol.All({ vol.All({
vol.Required(CONF_XPATH): cv.string,
vol.Required(CONF_NODE): cv.string, vol.Required(CONF_NODE): cv.string,
vol.Required(CONF_XPATH): cv.string,
}) })
]), ]),
}) })
SET_RUNTIME_VALUE_BOOL_SCHEMA = vol.Schema({ SET_RUNTIME_VALUE_BOOL_SCHEMA = vol.Schema({
vol.Required(ATTR_IHC_ID): cv.positive_int, vol.Required(ATTR_IHC_ID): cv.positive_int,
vol.Required(ATTR_VALUE): cv.boolean vol.Required(ATTR_VALUE): cv.boolean,
}) })
SET_RUNTIME_VALUE_INT_SCHEMA = vol.Schema({ SET_RUNTIME_VALUE_INT_SCHEMA = vol.Schema({
vol.Required(ATTR_IHC_ID): cv.positive_int, vol.Required(ATTR_IHC_ID): cv.positive_int,
vol.Required(ATTR_VALUE): int vol.Required(ATTR_VALUE): int,
}) })
SET_RUNTIME_VALUE_FLOAT_SCHEMA = vol.Schema({ SET_RUNTIME_VALUE_FLOAT_SCHEMA = vol.Schema({
vol.Required(ATTR_IHC_ID): cv.positive_int, vol.Required(ATTR_IHC_ID): cv.positive_int,
vol.Required(ATTR_VALUE): vol.Coerce(float) vol.Required(ATTR_VALUE): vol.Coerce(float),
}) })
_LOGGER = logging.getLogger(__name__)
IHC_PLATFORMS = ('binary_sensor', 'light', 'sensor', 'switch')
def setup(hass, config): def setup(hass, config):
"""Set up the IHC platform.""" """Set up the IHC platform."""
@ -189,13 +169,13 @@ def ihc_setup(hass, config, conf, controller_id):
return False return False
if (conf[CONF_AUTOSETUP] and if (conf[CONF_AUTOSETUP] and
not autosetup_ihc_products(hass, config, ihc_controller, not autosetup_ihc_products(
controller_id)): hass, config, ihc_controller, controller_id)):
return False return False
# Manual configuration # Manual configuration
get_manual_configuration(hass, config, conf, ihc_controller, get_manual_configuration(
controller_id) hass, config, conf, ihc_controller, controller_id)
# Store controler configuration # Store controller configuration
ihc_key = IHC_DATA.format(controller_id) ihc_key = IHC_DATA.format(controller_id)
hass.data[ihc_key] = { hass.data[ihc_key] = {
IHC_CONTROLLER: ihc_controller, IHC_CONTROLLER: ihc_controller,
@ -204,8 +184,8 @@ def ihc_setup(hass, config, conf, controller_id):
return True return True
def get_manual_configuration(hass, config, conf, ihc_controller, def get_manual_configuration(
controller_id): hass, config, conf, ihc_controller, controller_id):
"""Get manual configuration for IHC devices.""" """Get manual configuration for IHC devices."""
for component in IHC_PLATFORMS: for component in IHC_PLATFORMS:
discovery_info = {} discovery_info = {}
@ -230,8 +210,8 @@ def get_manual_configuration(hass, config, conf, ihc_controller,
} }
discovery_info[name] = device discovery_info[name] = device
if discovery_info: if discovery_info:
discovery.load_platform(hass, component, DOMAIN, discovery.load_platform(
discovery_info, config) hass, component, DOMAIN, discovery_info, config)
def autosetup_ihc_products(hass: HomeAssistantType, config, ihc_controller, def autosetup_ihc_products(hass: HomeAssistantType, config, ihc_controller,
@ -256,11 +236,11 @@ def autosetup_ihc_products(hass: HomeAssistantType, config, ihc_controller,
groups = project.findall('.//group') groups = project.findall('.//group')
for component in IHC_PLATFORMS: for component in IHC_PLATFORMS:
component_setup = auto_setup_conf[component] component_setup = auto_setup_conf[component]
discovery_info = get_discovery_info(component_setup, groups, discovery_info = get_discovery_info(
controller_id) component_setup, groups, controller_id)
if discovery_info: if discovery_info:
discovery.load_platform(hass, component, DOMAIN, discovery_info, discovery.load_platform(
config) hass, component, DOMAIN, discovery_info, config)
return True return True

22
homeassistant/components/ihc/const.py
View file

@ -1,22 +1,22 @@
"""IHC component constants.""" """IHC component constants."""
CONF_AUTOSETUP = 'auto_setup' CONF_AUTOSETUP = 'auto_setup'
CONF_INFO = 'info'
CONF_XPATH = 'xpath'
CONF_NODE = 'node'
CONF_INVERTING = 'inverting'
CONF_DIMMABLE = 'dimmable'
CONF_BINARY_SENSOR = 'binary_sensor' CONF_BINARY_SENSOR = 'binary_sensor'
CONF_DIMMABLE = 'dimmable'
CONF_INFO = 'info'
CONF_INVERTING = 'inverting'
CONF_LIGHT = 'light' CONF_LIGHT = 'light'
CONF_NAME = 'name'
CONF_NODE = 'node'
CONF_NOTE = 'note'
CONF_POSITION = 'position'
CONF_SENSOR = 'sensor' CONF_SENSOR = 'sensor'
CONF_SWITCH = 'switch' CONF_SWITCH = 'switch'
CONF_NAME = 'name' CONF_XPATH = 'xpath'
CONF_POSITION = 'position'
CONF_NOTE = 'note'
ATTR_IHC_ID = 'ihc_id' ATTR_IHC_ID = 'ihc_id'
ATTR_VALUE = 'value' ATTR_VALUE = 'value'
SERVICE_SET_RUNTIME_VALUE_BOOL = "set_runtime_value_bool" SERVICE_SET_RUNTIME_VALUE_BOOL = 'set_runtime_value_bool'
SERVICE_SET_RUNTIME_VALUE_INT = "set_runtime_value_int" SERVICE_SET_RUNTIME_VALUE_FLOAT = 'set_runtime_value_float'
SERVICE_SET_RUNTIME_VALUE_FLOAT = "set_runtime_value_float" SERVICE_SET_RUNTIME_VALUE_INT = 'set_runtime_value_int'

3
homeassistant/components/ihc/ihcdevice.py
View file

@ -1,5 +1,4 @@
"""Implementation of a base class for all IHC devices.""" """Implementation of a base class for all IHC devices."""
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
@ -51,7 +50,7 @@ class IHCDevice(Entity):
'ihc_id': self.ihc_id, 'ihc_id': self.ihc_id,
'ihc_name': self.ihc_name, 'ihc_name': self.ihc_name,
'ihc_note': self.ihc_note, 'ihc_note': self.ihc_note,
'ihc_position': self.ihc_position 'ihc_position': self.ihc_position,
} }
def on_ihc_change(self, ihc_id, value): def on_ihc_change(self, ihc_id, value):

18
homeassistant/components/ihc/services.yaml
View file

@ -1,26 +1,26 @@
# Describes the format for available IHC services # Describes the format for available IHC services
set_runtime_value_bool: set_runtime_value_bool:
description: Set a boolean runtime value on the IHC controller description: Set a boolean runtime value on the IHC controller.
fields: fields:
ihc_id: ihc_id:
description: The integer IHC resource id description: The integer IHC resource ID.
value: value:
description: The boolean value to set description: The boolean value to set.
set_runtime_value_int: set_runtime_value_int:
description: Set an integer runtime value on the IHC controller description: Set an integer runtime value on the IHC controller.
fields: fields:
ihc_id: ihc_id:
description: The integer IHC resource id description: The integer IHC resource ID.
value: value:
description: The integer value to set description: The integer value to set.
set_runtime_value_float: set_runtime_value_float:
description: Set a float runtime value on the IHC controller description: Set a float runtime value on the IHC controller.
fields: fields:
ihc_id: ihc_id:
description: The integer IHC resource id description: The integer IHC resource ID.
value: value:
description: The float value to set description: The float value to set.