ensure HA provider gets installed by default when running as addon

diff --git a/music_assistant/controllers/config.py b/music_assistant/controllers/config.py
index 51298d5d2dc45d280ab124632c5e35f9684b2f95..5fb07266d004368f3edc4de95255793ece17307a 100644 (file)
--- a/music_assistant/controllers/config.py
+++ b/music_assistant/controllers/config.py
@@ -910,7 +910,7 @@ class ConfigController:
         )
         default_config.validate()
         conf_key = f"{CONF_PROVIDERS}/{default_config.instance_id}"
-        self.set(conf_key, default_config.to_raw())
+        self.set_default(conf_key, default_config.to_raw())
 
     @api_command("config/core", required_role="admin")
     async def get_core_configs(self, include_values: bool = False) -> list[CoreConfig]:

diff --git a/music_assistant/mass.py b/music_assistant/mass.py
index 4d5d252e7df1545ffb2483ef9147fb6e038a0f5b..475c941315b3dbc5581229dc541043f46c0f44e5 100644 (file)
--- a/music_assistant/mass.py
+++ b/music_assistant/mass.py
@@ -810,6 +810,11 @@ class MusicAssistant:
                         icon_path = os.path.join(provider_path, "icon_monochrome.svg")
                         if await isfile(icon_path):
                             provider_manifest.icon_svg_monochrome = await get_icon_string(icon_path)
+                    # override Home Assistant provider if we're running as add-on
+                    if provider_manifest.domain == "hass" and self.running_as_hass_addon:
+                        provider_manifest.builtin = True
+                        provider_manifest.allow_disable = False
+
                     self._provider_manifests[provider_manifest.domain] = provider_manifest
                     LOGGER.debug("Loaded manifest for provider %s", provider_manifest.name)
                 except Exception as exc: