Fetch new option values correctly

tonyroberts · Dec 4, 2023 · 0b6899c · 0b6899c
1 parent 1cfa945
commit 0b6899c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/custom_components/wundasmart/__init__.py b/custom_components/wundasmart/__init__.py
@@ -32,9 +32,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     wunda_ip = entry.data[CONF_HOST]
     wunda_user = entry.data[CONF_USERNAME]
     wunda_pass = entry.data[CONF_PASSWORD]
-    update_interval = timedelta(seconds=entry.data.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL))
-    connect_timeout = entry.data.get(CONF_CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT)
-    read_timeout = entry.data.get(CONF_READ_TIMEOUT, DEFAULT_READ_TIMEOUT)
+    update_interval = timedelta(seconds=entry.options.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL))
+    connect_timeout = entry.options.get(CONF_CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT)
+    read_timeout = entry.options.get(CONF_READ_TIMEOUT, DEFAULT_READ_TIMEOUT)
     timeout = aiohttp.ClientTimeout(sock_connect=connect_timeout, sock_read=read_timeout)
 
     coordinator = WundasmartDataUpdateCoordinator(

diff --git a/custom_components/wundasmart/climate.py b/custom_components/wundasmart/climate.py
@@ -67,8 +67,8 @@ async def async_setup_entry(
     coordinator: WundasmartDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
     session = aiohttp_client.async_get_clientsession(hass)
 
-    connect_timeout = entry.data.get(CONF_CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT)
-    read_timeout = entry.data.get(CONF_READ_TIMEOUT, DEFAULT_READ_TIMEOUT)
+    connect_timeout = entry.options.get(CONF_CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT)
+    read_timeout = entry.options.get(CONF_READ_TIMEOUT, DEFAULT_READ_TIMEOUT)
     timeout = aiohttp.ClientTimeout(sock_connect=connect_timeout, sock_read=read_timeout)
 
     rooms = (

diff --git a/custom_components/wundasmart/config_flow.py b/custom_components/wundasmart/config_flow.py
@@ -19,14 +19,6 @@
     }
 )
 
-STEP_INIT_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Optional(CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL): int,
-        vol.Optional(CONF_CONNECT_TIMEOUT, default=DEFAULT_CONNECT_TIMEOUT): int,
-        vol.Optional(CONF_READ_TIMEOUT, default=DEFAULT_READ_TIMEOUT): int
-    }
-)
-
 
 class Hub:
     """Wundasmart Hub class."""
@@ -107,7 +99,25 @@ async def async_step_init(self, user_input: dict[str, Any] | None = None) -> Flo
         if user_input is not None:
             return self.async_create_entry(title="", data=user_input)
 
-        return self.async_show_form(step_id="init", data_schema=STEP_INIT_DATA_SCHEMA)
+        options = {
+            vol.Optional(
+                CONF_SCAN_INTERVAL,
+                default=self.config_entry.options.get(
+                    CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
+                )): int,
+            vol.Optional(
+                CONF_CONNECT_TIMEOUT,
+                default=self.config_entry.options.get(
+                    CONF_CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT
+                )): int,
+            vol.Optional(
+                CONF_READ_TIMEOUT,
+                default=self.config_entry.options.get(
+                    CONF_READ_TIMEOUT, DEFAULT_READ_TIMEOUT
+                )): int
+        }
+
+        return self.async_show_form(step_id="init", data_schema=vol.Schema(options))
 
 
 class CannotConnect(exceptions.HomeAssistantError):

diff --git a/custom_components/wundasmart/water_heater.py b/custom_components/wundasmart/water_heater.py
@@ -83,8 +83,8 @@ async def async_setup_entry(
     coordinator: WundasmartDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
     session = aiohttp_client.async_get_clientsession(hass)
 
-    connect_timeout = entry.data.get(CONF_CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT)
-    read_timeout = entry.data.get(CONF_READ_TIMEOUT, DEFAULT_READ_TIMEOUT)
+    connect_timeout = entry.options.get(CONF_CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT)
+    read_timeout = entry.options.get(CONF_READ_TIMEOUT, DEFAULT_READ_TIMEOUT)
     timeout = aiohttp.ClientTimeout(sock_connect=connect_timeout, sock_read=read_timeout)
 
     async_add_entities(