Handle configuration domain missing (#3578)

Author: andrew-codechimp

custom_components/battery_notes/config_flow.py

@@ -213,9 +213,9 @@ async def async_step_device(
 
         schema = DEVICE_SCHEMA
         # If show_all_devices = is specified and true, don't filter
-        domain_config = self.hass.data[MY_KEY]
-        if domain_config.show_all_devices:
-                schema = DEVICE_SCHEMA_ALL
+        domain_config = self.hass.data.get(MY_KEY)
+        if domain_config and domain_config.show_all_devices:
+            schema = DEVICE_SCHEMA_ALL
 
         return self.async_show_form(
             step_id="device",

custom_components/battery_notes/library.py

@@ -43,9 +43,8 @@ def _load_library_json(library_file: str) -> dict[str, Any]:
                 return cast(dict[str, Any], json.load(file))
 
         # User Library
-        domain_config = self.hass.data[MY_KEY]
-
-        if domain_config.user_library != "":
+        domain_config = self.hass.data.get(MY_KEY)
+        if domain_config and domain_config.user_library != "":
             json_user_path = self.hass.config.path(STORAGE_DIR, "battery_notes", domain_config.user_library)
             _LOGGER.debug("Using user library file at %s", json_user_path)
 

custom_components/battery_notes/library_updater.py

@@ -18,7 +18,7 @@
 from homeassistant.helpers.event import async_track_utc_time_change
 from homeassistant.helpers.storage import STORAGE_DIR
 
-from .coordinator import MY_KEY
+from .coordinator import MY_KEY, BatteryNotesDomainConfig
 from .discovery import DiscoveryManager
 
 _LOGGER = logging.getLogger(__name__)
@@ -38,7 +38,9 @@ def __init__(self, hass: HomeAssistant):
         """Initialize the library updater."""
         self.hass = hass
 
-        domain_config = self.hass.data[MY_KEY]
+        domain_config = self.hass.data.get(MY_KEY)
+        if not domain_config:
+            domain_config = BatteryNotesDomainConfig()
 
         library_url = domain_config.library_url
         schema_url = domain_config.schema_url
@@ -61,7 +63,7 @@ async def timer_update(self, now: datetime):
 
         domain_config = self.hass.data[MY_KEY]
 
-        if domain_config.enable_autodiscovery:
+        if domain_config and domain_config.enable_autodiscovery:
             discovery_manager = DiscoveryManager(self.hass, domain_config)
             await discovery_manager.start_discovery()
         else:
@@ -90,7 +92,9 @@ def _update_library_json(library_file: str, content: str) -> None:
                     _update_library_json, json_path, content
                 )
 
-                self.hass.data[MY_KEY].library_last_update = datetime.now()
+                domain_config = self.hass.data.get(MY_KEY)
+                if domain_config:
+                    self.hass.data[MY_KEY].library_last_update = datetime.now()
 
                 _LOGGER.debug("Updated library")
             else:
@@ -117,6 +121,10 @@ async def copy_schema(self):
     async def time_to_update_library(self, hours: int) -> bool:
         """Check when last updated and if OK to do a new library update."""
         try:
+            domain_config = self.hass.data.get(MY_KEY)
+            if not domain_config:
+                return True
+
             if library_last_update := self.hass.data[MY_KEY].library_last_update:
                 time_since_last_update = (
                     datetime.now() - library_last_update