updated apps
This commit is contained in:
@@ -37,7 +37,11 @@ from .configuration.global_config import (
|
||||
FLAG_HAS_GLOBAL_GUI_CONFIG,
|
||||
get_global_configuration,
|
||||
)
|
||||
from .configuration.sensor_config import SENSOR_CONFIG
|
||||
from .const import (
|
||||
CONF_COST_SENSOR_FRIENDLY_NAMING,
|
||||
CONF_COST_SENSOR_NAMING,
|
||||
CONF_CREATE_COST_SENSORS,
|
||||
CONF_CREATE_DOMAIN_GROUPS,
|
||||
CONF_CREATE_ENERGY_SENSORS,
|
||||
CONF_CREATE_STANDBY_GROUP,
|
||||
@@ -50,6 +54,10 @@ from .const import (
|
||||
CONF_ENABLE_ANALYTICS,
|
||||
CONF_ENABLE_AUTODISCOVERY_DEPRECATED,
|
||||
CONF_ENERGY_INTEGRATION_METHOD,
|
||||
CONF_ENERGY_PRICE,
|
||||
CONF_ENERGY_PRICE_MULTIPLIER,
|
||||
CONF_ENERGY_PRICE_SENSOR,
|
||||
CONF_ENERGY_PRICE_SURCHARGE,
|
||||
CONF_ENERGY_SENSOR_CATEGORY,
|
||||
CONF_ENERGY_SENSOR_FRIENDLY_NAMING,
|
||||
CONF_ENERGY_SENSOR_NAMING,
|
||||
@@ -98,10 +106,9 @@ from .const import (
|
||||
SensorType,
|
||||
UnitPrefix,
|
||||
)
|
||||
from .discovery import DiscoveryManager, DiscoveryStatus
|
||||
from .discovery import DiscoveryManager, DiscoveryStatus, get_discovery_manager
|
||||
from .migrate import async_fix_legacy_profile_config_entry, async_migrate_config_entry
|
||||
from .power_profile.power_profile import DeviceType
|
||||
from .sensor import SENSOR_CONFIG
|
||||
from .sensors.group.config_entry_utils import (
|
||||
get_entries_excluding_global_config,
|
||||
get_entries_having_subgroup,
|
||||
@@ -121,6 +128,7 @@ DISCOVERY_SCHEMA = vol.Schema(
|
||||
vol.Optional(CONF_EXCLUDE_SELF_USAGE): cv.boolean,
|
||||
},
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = vol.Schema(
|
||||
{
|
||||
vol.Optional(DOMAIN, default=dict): vol.All(
|
||||
@@ -156,6 +164,13 @@ CONFIG_SCHEMA = vol.Schema(
|
||||
vol.Optional(CONF_ENABLE_AUTODISCOVERY_DEPRECATED): cv.boolean,
|
||||
vol.Optional(CONF_DISCOVERY_EXCLUDE_SELF_USAGE_DEPRECATED): cv.boolean,
|
||||
vol.Optional(CONF_CREATE_ENERGY_SENSORS): cv.boolean,
|
||||
vol.Optional(CONF_CREATE_COST_SENSORS): cv.boolean,
|
||||
vol.Optional(CONF_ENERGY_PRICE): vol.Coerce(float),
|
||||
vol.Optional(CONF_ENERGY_PRICE_SENSOR): cv.entity_id,
|
||||
vol.Optional(CONF_ENERGY_PRICE_SURCHARGE): vol.Coerce(float),
|
||||
vol.Optional(CONF_ENERGY_PRICE_MULTIPLIER): vol.Coerce(float),
|
||||
vol.Optional(CONF_COST_SENSOR_NAMING): validate_name_pattern,
|
||||
vol.Optional(CONF_COST_SENSOR_FRIENDLY_NAMING): validate_name_pattern,
|
||||
vol.Optional(CONF_CREATE_UTILITY_METERS): cv.boolean,
|
||||
vol.Optional(CONF_UTILITY_METER_TARIFFS): vol.All(cv.ensure_list, [cv.string]),
|
||||
vol.Optional(CONF_UTILITY_METER_TYPES): vol.All(cv.ensure_list, [vol.In(METER_TYPES)]),
|
||||
@@ -293,7 +308,7 @@ def register_services(hass: HomeAssistant) -> None:
|
||||
|
||||
async def _handle_update_library_service(_: ServiceCall) -> None:
|
||||
_LOGGER.info("Updating library and rediscovering devices")
|
||||
discovery_manager: DiscoveryManager = hass.data[DOMAIN][DATA_DISCOVERY_MANAGER]
|
||||
discovery_manager = get_discovery_manager(hass)
|
||||
await discovery_manager.update_library_and_rediscover()
|
||||
|
||||
hass.services.async_register(
|
||||
@@ -447,7 +462,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||
|
||||
await async_fix_legacy_profile_config_entry(hass, entry)
|
||||
await hass.config_entries.async_forward_entry_setups(entry, [Platform.SENSOR, Platform.SELECT])
|
||||
# await hass.config_entries.async_forward_entry_setups(entry, [Platform.SENSOR])
|
||||
|
||||
entry.async_on_unload(entry.add_update_listener(async_update_entry))
|
||||
|
||||
@@ -460,7 +474,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||
await apply_global_gui_configuration_changes(hass)
|
||||
|
||||
discovery_enabled = bool(entry.data.get(CONF_DISCOVERY, {}).get(CONF_ENABLED, False))
|
||||
discovery_manager: DiscoveryManager = hass.data[DOMAIN][DATA_DISCOVERY_MANAGER]
|
||||
discovery_manager = get_discovery_manager(hass)
|
||||
if discovery_enabled and discovery_manager.status == DiscoveryStatus.DISABLED:
|
||||
_LOGGER.debug("Enabling discovery manager based on global configuration")
|
||||
discovery_manager.enable()
|
||||
@@ -516,7 +530,7 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
|
||||
|
||||
async def async_remove_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> None:
|
||||
"""Called after a config entry is removed."""
|
||||
discovery_manager: DiscoveryManager = hass.data[DOMAIN][DATA_DISCOVERY_MANAGER]
|
||||
discovery_manager = get_discovery_manager(hass)
|
||||
discovery_manager.remove_initialized_flow(config_entry)
|
||||
|
||||
updated_entries: list[ConfigEntry] = []
|
||||
|
||||
Reference in New Issue
Block a user