Remove deprecated hide_if_away from device trackers (#32705)
This commit is contained in:
1 parent
943c7ee11a
commit
bfacd9a1c3
6 files changed
+3
-65
No files matched your search
@@ -25,12 +25,10 @@ from .const import (
|
||||
ATTR_LOCATION_NAME,
|
||||
ATTR_MAC,
|
||||
ATTR_SOURCE_TYPE,
|
||||
CONF_AWAY_HIDE,
|
||||
CONF_CONSIDER_HOME,
|
||||
CONF_NEW_DEVICE_DEFAULTS,
|
||||
CONF_SCAN_INTERVAL,
|
||||
CONF_TRACK_NEW,
|
||||
DEFAULT_AWAY_HIDE,
|
||||
DEFAULT_CONSIDER_HOME,
|
||||
DEFAULT_TRACK_NEW,
|
||||
DOMAIN,
|
||||
@@ -53,15 +51,7 @@ SOURCE_TYPES = (
|
||||
|
||||
NEW_DEVICE_DEFAULTS_SCHEMA = vol.Any(
|
||||
None,
|
||||
vol.All(
|
||||
cv.deprecated(CONF_AWAY_HIDE, invalidation_version="0.107.0"),
|
||||
vol.Schema(
|
||||
{
|
||||
vol.Optional(CONF_TRACK_NEW, default=DEFAULT_TRACK_NEW): cv.boolean,
|
||||
vol.Optional(CONF_AWAY_HIDE, default=DEFAULT_AWAY_HIDE): cv.boolean,
|
||||
}
|
||||
),
|
||||
),
|
||||
vol.Schema({vol.Optional(CONF_TRACK_NEW, default=DEFAULT_TRACK_NEW): cv.boolean}),
|
||||
)
|
||||
PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend(
|
||||
{
|
||||
|
||||
@@ -20,9 +20,6 @@ SCAN_INTERVAL = timedelta(seconds=12)
|
||||
CONF_TRACK_NEW = "track_new_devices"
|
||||
DEFAULT_TRACK_NEW = True
|
||||
|
||||
CONF_AWAY_HIDE = "hide_if_away"
|
||||
DEFAULT_AWAY_HIDE = False
|
||||
|
||||
CONF_CONSIDER_HOME = "consider_home"
|
||||
DEFAULT_CONSIDER_HOME = timedelta(seconds=180)
|
||||
|
||||
|
||||
@@ -37,11 +37,9 @@ from .const import (
|
||||
ATTR_HOST_NAME,
|
||||
ATTR_MAC,
|
||||
ATTR_SOURCE_TYPE,
|
||||
CONF_AWAY_HIDE,
|
||||
CONF_CONSIDER_HOME,
|
||||
CONF_NEW_DEVICE_DEFAULTS,
|
||||
CONF_TRACK_NEW,
|
||||
DEFAULT_AWAY_HIDE,
|
||||
DEFAULT_CONSIDER_HOME,
|
||||
DEFAULT_TRACK_NEW,
|
||||
DOMAIN,
|
||||
@@ -198,7 +196,6 @@ class DeviceTracker:
|
||||
mac,
|
||||
picture=picture,
|
||||
icon=icon,
|
||||
hide_if_away=self.defaults.get(CONF_AWAY_HIDE, DEFAULT_AWAY_HIDE),
|
||||
)
|
||||
self.devices[dev_id] = device
|
||||
if mac is not None:
|
||||
@@ -303,7 +300,6 @@ class Device(RestoreEntity):
|
||||
picture: str = None,
|
||||
gravatar: str = None,
|
||||
icon: str = None,
|
||||
hide_if_away: bool = False,
|
||||
) -> None:
|
||||
"""Initialize a device."""
|
||||
self.hass = hass
|
||||
@@ -331,8 +327,6 @@ class Device(RestoreEntity):
|
||||
|
||||
self.icon = icon
|
||||
|
||||
self.away_hide = hide_if_away
|
||||
|
||||
self.source_type = None
|
||||
|
||||
self._attributes = {}
|
||||
@@ -372,11 +366,6 @@ class Device(RestoreEntity):
|
||||
"""Return device state attributes."""
|
||||
return self._attributes
|
||||
|
||||
@property
|
||||
def hidden(self):
|
||||
"""If device should be hidden."""
|
||||
return self.away_hide and self.state != STATE_HOME
|
||||
|
||||
async def async_seen(
|
||||
self,
|
||||
host_name: str = None,
|
||||
@@ -524,7 +513,6 @@ async def async_load_config(
|
||||
vol.Optional(CONF_MAC, default=None): vol.Any(
|
||||
None, vol.All(cv.string, vol.Upper)
|
||||
),
|
||||
vol.Optional(CONF_AWAY_HIDE, default=DEFAULT_AWAY_HIDE): cv.boolean,
|
||||
vol.Optional("gravatar", default=None): vol.Any(None, cv.string),
|
||||
vol.Optional("picture", default=None): vol.Any(None, cv.string),
|
||||
vol.Optional(CONF_CONSIDER_HOME, default=consider_home): vol.All(
|
||||
@@ -544,6 +532,7 @@ async def async_load_config(
|
||||
for dev_id, device in devices.items():
|
||||
# Deprecated option. We just ignore it to avoid breaking change
|
||||
device.pop("vendor", None)
|
||||
device.pop("hide_if_away", None)
|
||||
try:
|
||||
device = dev_schema(device)
|
||||
device["dev_id"] = cv.slugify(dev_id)
|
||||
@@ -564,7 +553,6 @@ def update_config(path: str, dev_id: str, device: Device):
|
||||
ATTR_ICON: device.icon,
|
||||
"picture": device.config_picture,
|
||||
"track": device.track,
|
||||
CONF_AWAY_HIDE: device.away_hide,
|
||||
}
|
||||
}
|
||||
out.write("\n")
|
||||
|
||||
Reference in new issue
Block a user