From 4e826f170452129e30af713323eac347d8f08f97 Mon Sep 17 00:00:00 2001 From: Joost Lekkerkerker Date: Fri, 8 Sep 2023 01:16:08 +0200 Subject: [PATCH] Use shorthand attributes in Syncthing (#99883) --- homeassistant/components/syncthing/sensor.py | 31 ++++++-------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/homeassistant/components/syncthing/sensor.py b/homeassistant/components/syncthing/sensor.py index 0551ae29d2c..c88de91cae0 100644 --- a/homeassistant/components/syncthing/sensor.py +++ b/homeassistant/components/syncthing/sensor.py @@ -94,19 +94,17 @@ class FolderSensor(SensorEntity): self._folder_label = folder_label self._state = None self._unsub_timer = None - self._version = version self._short_server_id = server_id.split("-")[0] - - @property - def name(self): - """Return the name of the sensor.""" - return f"{self._short_server_id} {self._folder_id} {self._folder_label}" - - @property - def unique_id(self): - """Return the unique id of the entity.""" - return f"{self._short_server_id}-{self._folder_id}" + self._attr_name = f"{self._short_server_id} {folder_id} {folder_label}" + self._attr_unique_id = f"{self._short_server_id}-{folder_id}" + self._attr_device_info = DeviceInfo( + entry_type=DeviceEntryType.SERVICE, + identifiers={(DOMAIN, self._server_id)}, + manufacturer="Syncthing Team", + name=f"Syncthing ({syncthing.url})", + sw_version=version, + ) @property def native_value(self): @@ -132,17 +130,6 @@ class FolderSensor(SensorEntity): """Return the state attributes.""" return self._state - @property - def device_info(self) -> DeviceInfo: - """Return device information.""" - return DeviceInfo( - entry_type=DeviceEntryType.SERVICE, - identifiers={(DOMAIN, self._server_id)}, - manufacturer="Syncthing Team", - name=f"Syncthing ({self._syncthing.url})", - sw_version=self._version, - ) - async def async_update_status(self): """Request folder status and update state.""" try: