From 7c2bd319f1773004d59129ea9a21ca23a24f61df Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 11 Jul 2022 18:59:21 +0200 Subject: [PATCH] Migrate AdGuard Home to new entity naming style (#74999) * Migrate AdGuard Home to new entity naming style * sentence-casing --- homeassistant/components/adguard/__init__.py | 2 ++ homeassistant/components/adguard/sensor.py | 16 ++++++++-------- homeassistant/components/adguard/switch.py | 16 ++++++---------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/homeassistant/components/adguard/__init__.py b/homeassistant/components/adguard/__init__.py index 2bb15d19223..0c43f84bdfc 100644 --- a/homeassistant/components/adguard/__init__.py +++ b/homeassistant/components/adguard/__init__.py @@ -132,6 +132,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: class AdGuardHomeEntity(Entity): """Defines a base AdGuard Home entity.""" + _attr_has_entity_name = True + def __init__( self, adguard: AdGuardHome, diff --git a/homeassistant/components/adguard/sensor.py b/homeassistant/components/adguard/sensor.py index 8134d2c4d43..2d3226aba59 100644 --- a/homeassistant/components/adguard/sensor.py +++ b/homeassistant/components/adguard/sensor.py @@ -100,7 +100,7 @@ class AdGuardHomeDNSQueriesSensor(AdGuardHomeSensor): super().__init__( adguard, entry, - "AdGuard DNS Queries", + "DNS queries", "mdi:magnify", "dns_queries", "queries", @@ -119,7 +119,7 @@ class AdGuardHomeBlockedFilteringSensor(AdGuardHomeSensor): super().__init__( adguard, entry, - "AdGuard DNS Queries Blocked", + "DNS queries blocked", "mdi:magnify-close", "blocked_filtering", "queries", @@ -139,7 +139,7 @@ class AdGuardHomePercentageBlockedSensor(AdGuardHomeSensor): super().__init__( adguard, entry, - "AdGuard DNS Queries Blocked Ratio", + "DNS queries blocked ratio", "mdi:magnify-close", "blocked_percentage", PERCENTAGE, @@ -159,7 +159,7 @@ class AdGuardHomeReplacedParentalSensor(AdGuardHomeSensor): super().__init__( adguard, entry, - "AdGuard Parental Control Blocked", + "Parental control blocked", "mdi:human-male-girl", "blocked_parental", "requests", @@ -178,7 +178,7 @@ class AdGuardHomeReplacedSafeBrowsingSensor(AdGuardHomeSensor): super().__init__( adguard, entry, - "AdGuard Safe Browsing Blocked", + "Safe browsing blocked", "mdi:shield-half-full", "blocked_safebrowsing", "requests", @@ -197,7 +197,7 @@ class AdGuardHomeReplacedSafeSearchSensor(AdGuardHomeSensor): super().__init__( adguard, entry, - "AdGuard Safe Searches Enforced", + "Safe searches enforced", "mdi:shield-search", "enforced_safesearch", "requests", @@ -216,7 +216,7 @@ class AdGuardHomeAverageProcessingTimeSensor(AdGuardHomeSensor): super().__init__( adguard, entry, - "AdGuard Average Processing Speed", + "Average processing speed", "mdi:speedometer", "average_speed", TIME_MILLISECONDS, @@ -236,7 +236,7 @@ class AdGuardHomeRulesCountSensor(AdGuardHomeSensor): super().__init__( adguard, entry, - "AdGuard Rules Count", + "Rules count", "mdi:counter", "rules_count", "rules", diff --git a/homeassistant/components/adguard/switch.py b/homeassistant/components/adguard/switch.py index 0cb7a48fee6..5b4017d4054 100644 --- a/homeassistant/components/adguard/switch.py +++ b/homeassistant/components/adguard/switch.py @@ -107,9 +107,7 @@ class AdGuardHomeProtectionSwitch(AdGuardHomeSwitch): def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None: """Initialize AdGuard Home switch.""" - super().__init__( - adguard, entry, "AdGuard Protection", "mdi:shield-check", "protection" - ) + super().__init__(adguard, entry, "Protection", "mdi:shield-check", "protection") async def _adguard_turn_off(self) -> None: """Turn off the switch.""" @@ -130,7 +128,7 @@ class AdGuardHomeParentalSwitch(AdGuardHomeSwitch): def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None: """Initialize AdGuard Home switch.""" super().__init__( - adguard, entry, "AdGuard Parental Control", "mdi:shield-check", "parental" + adguard, entry, "Parental control", "mdi:shield-check", "parental" ) async def _adguard_turn_off(self) -> None: @@ -152,7 +150,7 @@ class AdGuardHomeSafeSearchSwitch(AdGuardHomeSwitch): def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None: """Initialize AdGuard Home switch.""" super().__init__( - adguard, entry, "AdGuard Safe Search", "mdi:shield-check", "safesearch" + adguard, entry, "Safe search", "mdi:shield-check", "safesearch" ) async def _adguard_turn_off(self) -> None: @@ -174,7 +172,7 @@ class AdGuardHomeSafeBrowsingSwitch(AdGuardHomeSwitch): def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None: """Initialize AdGuard Home switch.""" super().__init__( - adguard, entry, "AdGuard Safe Browsing", "mdi:shield-check", "safebrowsing" + adguard, entry, "Safe browsing", "mdi:shield-check", "safebrowsing" ) async def _adguard_turn_off(self) -> None: @@ -195,9 +193,7 @@ class AdGuardHomeFilteringSwitch(AdGuardHomeSwitch): def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None: """Initialize AdGuard Home switch.""" - super().__init__( - adguard, entry, "AdGuard Filtering", "mdi:shield-check", "filtering" - ) + super().__init__(adguard, entry, "Filtering", "mdi:shield-check", "filtering") async def _adguard_turn_off(self) -> None: """Turn off the switch.""" @@ -220,7 +216,7 @@ class AdGuardHomeQueryLogSwitch(AdGuardHomeSwitch): super().__init__( adguard, entry, - "AdGuard Query Log", + "Query log", "mdi:shield-check", "querylog", enabled_default=False,