fix: 🐛 Fixes a bug where klipper url wasn't checked correctly which l…

…eads to an exception fixes #100
Disane87 · Mar 18, 2024 · 441e4e5 · 441e4e5
1 parent 20ba583
commit 441e4e5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/custom_components/spoolman/config_flow.py b/custom_components/spoolman/config_flow.py
@@ -43,7 +43,8 @@ async def async_step_user(
         if user_input is not None:
             spoolman_info, spoolman_errors, spoolman_url = await self.get_spoolman_api_info(user_input.get(CONF_URL, ""))
 
-            if user_input.get(KLIPPER_URL, None) is not None:
+            klipper_url = user_input.get(KLIPPER_URL, None)
+            if klipper_url is not None and klipper_url != "":
                 klipper_info, klipper_errors, klipper_url = await self.get_klipper_api_info(user_input.get(KLIPPER_URL, None))
 
             if not spoolman_errors and not klipper_errors:

diff --git a/custom_components/spoolman/coordinator.py b/custom_components/spoolman/coordinator.py
@@ -56,8 +56,8 @@ async def _async_update_data(self):
                 {"allow_archived": show_archived}
             )
 
-            klipper_url = config.get(KLIPPER_URL, None)
-            if klipper_url is not None:
+            klipper_url = config.get(KLIPPER_URL, "")
+            if klipper_url is not None and klipper_url != "":
                 klipper_active_spool: int = await KlipperAPI(klipper_url).get_active_spool_id()
                 for spool in spools:
                     if spool["id"] == klipper_active_spool:

diff --git a/custom_components/spoolman/options_flow.py b/custom_components/spoolman/options_flow.py
@@ -26,7 +26,8 @@ async def async_step_init(self, user_input: dict[str, Any] | None = None) -> Flo
         if user_input is not None:
             spoolman_info, spoolman_errors, spoolman_url = await self.get_spoolman_api_info(user_input.get(CONF_URL, ""))
 
-            if user_input.get(KLIPPER_URL, None) is not None:
+            klipper_url = user_input.get(KLIPPER_URL, None)
+            if klipper_url is not None and klipper_url != "":
                 klipper_info, klipper_errors, klipper_url = await self.get_klipper_api_info(user_input.get(KLIPPER_URL, None))
 
             if not spoolman_errors and not klipper_errors: