From c6f28f6d59d9be13a49ba28b396898e8e571cdab Mon Sep 17 00:00:00 2001
From: Robert Hillis <tkdrob4390@yahoo.com>
Date: Fri, 7 Oct 2022 21:53:48 -0400
Subject: [PATCH] Migrate Sonarr to new entity naming style (#79844)

---
 homeassistant/components/sonarr/const.py  |  1 +
 homeassistant/components/sonarr/entity.py |  8 +++++---
 homeassistant/components/sonarr/sensor.py | 12 ++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/sonarr/const.py b/homeassistant/components/sonarr/const.py
index 283c7fa72f9..5468953184a 100644
--- a/homeassistant/components/sonarr/const.py
+++ b/homeassistant/components/sonarr/const.py
@@ -12,6 +12,7 @@ CONF_UPCOMING_DAYS = "upcoming_days"
 CONF_WANTED_MAX_ITEMS = "wanted_max_items"
 
 # Defaults
+DEFAULT_NAME = "Sonarr"
 DEFAULT_UPCOMING_DAYS = 1
 DEFAULT_VERIFY_SSL = False
 DEFAULT_WANTED_MAX_ITEMS = 50
diff --git a/homeassistant/components/sonarr/entity.py b/homeassistant/components/sonarr/entity.py
index 70d0299765d..e8a65239be7 100644
--- a/homeassistant/components/sonarr/entity.py
+++ b/homeassistant/components/sonarr/entity.py
@@ -5,13 +5,15 @@ from homeassistant.helpers.device_registry import DeviceEntryType
 from homeassistant.helpers.entity import DeviceInfo, EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DOMAIN
+from .const import DEFAULT_NAME, DOMAIN
 from .coordinator import SonarrDataT, SonarrDataUpdateCoordinator
 
 
 class SonarrEntity(CoordinatorEntity[SonarrDataUpdateCoordinator[SonarrDataT]]):
     """Defines a base Sonarr entity."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: SonarrDataUpdateCoordinator[SonarrDataT],
@@ -30,7 +32,7 @@ class SonarrEntity(CoordinatorEntity[SonarrDataUpdateCoordinator[SonarrDataT]]):
             configuration_url=self.coordinator.host_configuration.base_url,
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, self.coordinator.config_entry.entry_id)},
-            manufacturer="Sonarr",
-            name="Activity Sensor",
+            manufacturer=DEFAULT_NAME,
+            name=DEFAULT_NAME,
             sw_version=self.coordinator.system_version,
         )
diff --git a/homeassistant/components/sonarr/sensor.py b/homeassistant/components/sonarr/sensor.py
index 186cebda79b..da0e4c5af8c 100644
--- a/homeassistant/components/sonarr/sensor.py
+++ b/homeassistant/components/sonarr/sensor.py
@@ -43,7 +43,7 @@ class SonarrSensorEntityDescription(
 SENSOR_TYPES: dict[str, SonarrSensorEntityDescription[Any]] = {
     "commands": SonarrSensorEntityDescription(
         key="commands",
-        name="Sonarr Commands",
+        name="Commands",
         icon="mdi:code-braces",
         native_unit_of_measurement="Commands",
         entity_registry_enabled_default=False,
@@ -51,7 +51,7 @@ SENSOR_TYPES: dict[str, SonarrSensorEntityDescription[Any]] = {
     ),
     "diskspace": SonarrSensorEntityDescription[list[Diskspace]](
         key="diskspace",
-        name="Sonarr Disk Space",
+        name="Disk space",
         icon="mdi:harddisk",
         native_unit_of_measurement=DATA_GIGABYTES,
         entity_registry_enabled_default=False,
@@ -59,7 +59,7 @@ SENSOR_TYPES: dict[str, SonarrSensorEntityDescription[Any]] = {
     ),
     "queue": SonarrSensorEntityDescription[SonarrQueue](
         key="queue",
-        name="Sonarr Queue",
+        name="Queue",
         icon="mdi:download",
         native_unit_of_measurement="Episodes",
         entity_registry_enabled_default=False,
@@ -67,7 +67,7 @@ SENSOR_TYPES: dict[str, SonarrSensorEntityDescription[Any]] = {
     ),
     "series": SonarrSensorEntityDescription[list[SonarrSeries]](
         key="series",
-        name="Sonarr Shows",
+        name="Shows",
         icon="mdi:television",
         native_unit_of_measurement="Series",
         entity_registry_enabled_default=False,
@@ -75,14 +75,14 @@ SENSOR_TYPES: dict[str, SonarrSensorEntityDescription[Any]] = {
     ),
     "upcoming": SonarrSensorEntityDescription[list[SonarrCalendar]](
         key="upcoming",
-        name="Sonarr Upcoming",
+        name="Upcoming",
         icon="mdi:television",
         native_unit_of_measurement="Episodes",
         value_fn=len,
     ),
     "wanted": SonarrSensorEntityDescription[SonarrWantedMissing](
         key="wanted",
-        name="Sonarr Wanted",
+        name="Wanted",
         icon="mdi:television",
         native_unit_of_measurement="Episodes",
         entity_registry_enabled_default=False,