From 61a1245a84bdd703ca1f4ac5ab2f76a374d381ac Mon Sep 17 00:00:00 2001
From: Rami Mosleh <engrbm87@gmail.com>
Date: Tue, 31 Oct 2023 11:49:03 +0400
Subject: [PATCH] Code cleanup for transmission integration (#103078)

---
 homeassistant/components/transmission/__init__.py    | 12 +-----------
 homeassistant/components/transmission/config_flow.py |  9 +++------
 homeassistant/components/transmission/coordinator.py |  8 ++++----
 homeassistant/components/transmission/strings.json   |  2 --
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/homeassistant/components/transmission/__init__.py b/homeassistant/components/transmission/__init__.py
index 7d019935e6c..df78c5d96aa 100644
--- a/homeassistant/components/transmission/__init__.py
+++ b/homeassistant/components/transmission/__init__.py
@@ -1,7 +1,6 @@
 """Support for the Transmission BitTorrent client API."""
 from __future__ import annotations
 
-from datetime import timedelta
 from functools import partial
 import logging
 import re
@@ -22,7 +21,6 @@ from homeassistant.const import (
     CONF_NAME,
     CONF_PASSWORD,
     CONF_PORT,
-    CONF_SCAN_INTERVAL,
     CONF_USERNAME,
     Platform,
 )
@@ -69,7 +67,7 @@ MIGRATION_NAME_TO_KEY = {
 
 SERVICE_BASE_SCHEMA = vol.Schema(
     {
-        vol.Exclusive(CONF_ENTRY_ID, "identifier"): selector.ConfigEntrySelector(),
+        vol.Required(CONF_ENTRY_ID): selector.ConfigEntrySelector(),
     }
 )
 
@@ -135,7 +133,6 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = coordinator
 
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
-    config_entry.add_update_listener(async_options_updated)
 
     async def add_torrent(service: ServiceCall) -> None:
         """Add new torrent to download."""
@@ -244,10 +241,3 @@ async def get_api(
     except TransmissionError as error:
         _LOGGER.error(error)
         raise UnknownError from error
-
-
-async def async_options_updated(hass: HomeAssistant, entry: ConfigEntry) -> None:
-    """Triggered by config entry options updates."""
-    coordinator: TransmissionDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
-    coordinator.update_interval = timedelta(seconds=entry.options[CONF_SCAN_INTERVAL])
-    await coordinator.async_request_refresh()
diff --git a/homeassistant/components/transmission/config_flow.py b/homeassistant/components/transmission/config_flow.py
index d16981add87..a987233fef0 100644
--- a/homeassistant/components/transmission/config_flow.py
+++ b/homeassistant/components/transmission/config_flow.py
@@ -55,12 +55,9 @@ class TransmissionFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         errors = {}
 
         if user_input is not None:
-            for entry in self._async_current_entries():
-                if (
-                    entry.data[CONF_HOST] == user_input[CONF_HOST]
-                    and entry.data[CONF_PORT] == user_input[CONF_PORT]
-                ):
-                    return self.async_abort(reason="already_configured")
+            self._async_abort_entries_match(
+                {CONF_HOST: user_input[CONF_HOST], CONF_PORT: user_input[CONF_PORT]}
+            )
             try:
                 await get_api(self.hass, user_input)
 
diff --git a/homeassistant/components/transmission/coordinator.py b/homeassistant/components/transmission/coordinator.py
index 9df509b9783..91597d0e43d 100644
--- a/homeassistant/components/transmission/coordinator.py
+++ b/homeassistant/components/transmission/coordinator.py
@@ -71,13 +71,13 @@ class TransmissionDataUpdateCoordinator(DataUpdateCoordinator[SessionStats]):
             data = self.api.session_stats()
             self.torrents = self.api.get_torrents()
             self._session = self.api.get_session()
-
-            self.check_completed_torrent()
-            self.check_started_torrent()
-            self.check_removed_torrent()
         except transmission_rpc.TransmissionError as err:
             raise UpdateFailed("Unable to connect to Transmission client") from err
 
+        self.check_completed_torrent()
+        self.check_started_torrent()
+        self.check_removed_torrent()
+
         return data
 
     def init_torrent_list(self) -> None:
diff --git a/homeassistant/components/transmission/strings.json b/homeassistant/components/transmission/strings.json
index 81d94b9aac4..77ffd6a8b2a 100644
--- a/homeassistant/components/transmission/strings.json
+++ b/homeassistant/components/transmission/strings.json
@@ -30,9 +30,7 @@
   "options": {
     "step": {
       "init": {
-        "title": "Configure options for Transmission",
         "data": {
-          "scan_interval": "Update frequency",
           "limit": "Limit",
           "order": "Order"
         }