From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Wed, 26 Feb 2025 20:17:39 +0000 (+0100)
Subject: Fix: playergroups not correctly migrated
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=27db572a4f1511dc73b0323e1e95c3c87a00422d;p=music-assistant-server.git

Fix: playergroups not correctly migrated
---

diff --git a/music_assistant/controllers/config.py b/music_assistant/controllers/config.py
index 9edac896..d0733154 100644
--- a/music_assistant/controllers/config.py
+++ b/music_assistant/controllers/config.py
@@ -323,7 +323,7 @@ class ConfigController:
     async def get_player_configs(
         self, provider: str | None = None, include_values: bool = False
     ) -> list[PlayerConfig]:
-        """Return all known player configurations, optionally filtered by provider domain."""
+        """Return all known player configurations, optionally filtered by provider id."""
         return [
             await self.get_player_config(raw_conf["player_id"])
             if include_values
diff --git a/music_assistant/providers/player_group/__init__.py b/music_assistant/providers/player_group/__init__.py
index 52388977..5022718d 100644
--- a/music_assistant/providers/player_group/__init__.py
+++ b/music_assistant/providers/player_group/__init__.py
@@ -182,10 +182,16 @@ class PlayerGroupProvider(PlayerProvider):
         # temp: migrate old config entries
         # remove this after MA 2.4 release
         for player_config in await self.mass.config.get_player_configs(include_values=True):
+            # migrate provider set to domain to instance_id
+            if player_config.provider == self.manifest.domain:
+                self.mass.config.set_raw_player_config_value(
+                    player_config.player_id, "provider", self.instance_id
+                )
+                player_config.provider = self.instance_id
+            # migrate old syncgroup/UGP players to this provider
             if player_config.values.get(CONF_GROUP_TYPE) is not None:
                 # already migrated
                 continue
-            # migrate old syncgroup players to this provider
             if player_config.player_id.startswith(SYNCGROUP_PREFIX):
                 self.mass.config.set_raw_player_config_value(
                     player_config.player_id, CONF_GROUP_TYPE, player_config.provider
@@ -194,7 +200,6 @@ class PlayerGroupProvider(PlayerProvider):
                 self.mass.config.set_raw_player_config_value(
                     player_config.player_id, "provider", self.instance_id
                 )
-            # migrate old UGP players to this provider
             elif player_config.player_id.startswith(UNIVERSAL_PREFIX):
                 self.mass.config.set_raw_player_config_value(
                     player_config.player_id, CONF_GROUP_TYPE, "universal"