Key media item translation names by media type (#4216)

Author: marcelveldt

music_assistant/controllers/translations/__init__.py

@@ -139,7 +139,9 @@ async def reverse_lookup_media_names(self, query: str) -> set[str]:
 
         Lets localized item names be found by the name the user sees: a text search that returns
         nothing literally can be retried against these canonical names (which equal the items'
-        stored ``search_name``). Only ``common.media.*.name`` entries are considered.
+        stored ``search_name``). Only genre and playlist names (``common.media.genre.*`` /
+        ``common.media.playlist.*``) are considered — the searchable library media types; browse
+        and recommendation folder titles are display-only and never library items.
 
         The reverse-translation always uses the metadata controller's configured language
         (``CONF_LANGUAGE``), which doubles as the fallback search locale; an English, unknown or
@@ -157,7 +159,9 @@ async def reverse_lookup_media_names(self, query: str) -> set[str]:
             return set()
         matches: set[str] = set()
         for key, value in bundle.items():
-            if not (key.startswith("common.media.") and key.endswith(".name")):
+            if not key.endswith(".name"):
+                continue
+            if not key.startswith(("common.media.genre.", "common.media.playlist.")):
                 continue
             if normalized in create_safe_string(value, True, True):
                 if english := self._source.get(key):
@@ -219,8 +223,9 @@ def _candidate_keys(key: str, owner_prefix: str | None = None) -> list[str]:
 
     A fully-qualified key (starting with ``provider.``/``core.``/``common.``) is tried
     as-is plus a ``common.`` rewrite that drops the owner segment. A relative key is tried
-    under the owner prefix (if any), then ``common.``, then bare. Any candidate ending in
-    ``.name`` also gets a bare fallback (dropping ``.name``).
+    under the owner prefix (if any), then ``common.``, then bare. Multi-instance providers carry
+    an ``<domain>--<id>`` instance id, so the domain-only prefix is also tried before ``common.``.
+    Any candidate ending in ``.name`` also gets a bare fallback (dropping ``.name``).
     """
     roots = ("provider.", "core.", "common.")
     base_candidates: list[str] = []
@@ -235,6 +240,10 @@ def _candidate_keys(key: str, owner_prefix: str | None = None) -> list[str]:
     else:
         if owner_prefix:
             base_candidates.append(f"{owner_prefix}.{key}")
+            # a multi-instance owner is "provider.<domain>--<id>"; also try the bare domain
+            domain_prefix = owner_prefix.split("--", 1)[0]
+            if domain_prefix != owner_prefix:
+                base_candidates.append(f"{domain_prefix}.{key}")
         base_candidates.append(f"common.{key}")
         base_candidates.append(key)
     candidates: list[str] = []

music_assistant/providers/builtin/__init__.py

@@ -256,7 +256,7 @@ async def get_playlist(self, prov_playlist_id: str) -> Playlist:
                 item_id=prov_playlist_id,
                 provider=self.instance_id,
                 name=BUILTIN_PLAYLISTS[prov_playlist_id],
-                translation_key=f"builtin_playlist.{prov_playlist_id}",
+                translation_key=prov_playlist_id,
                 provider_mappings={
                     ProviderMapping(
                         item_id=prov_playlist_id,

music_assistant/providers/deezer/__init__.py

@@ -616,7 +616,7 @@ async def recommendations(self) -> list[RecommendationFolder]:
                 item_id="made_for_you",
                 provider=self.instance_id,
                 name="Made for you",
-                translation_key="recommendations.made_for_you",
+                translation_key="made_for_you",
                 items=UniqueList(made_for_you_items),
             )
         )
@@ -630,7 +630,7 @@ async def recommendations(self) -> list[RecommendationFolder]:
                         item_id="recommended_albums",
                         provider=self.instance_id,
                         name="Recommended albums",
-                        translation_key="recommendations.recommended_albums",
+                        translation_key="recommended_albums",
                         items=UniqueList(
                             [self.parse_album(album=album) for album in recommended_albums]
                         ),
@@ -648,7 +648,7 @@ async def recommendations(self) -> list[RecommendationFolder]:
                         item_id="recommended_artists",
                         provider=self.instance_id,
                         name="Recommended artists",
-                        translation_key="recommendations.recommended_artists",
+                        translation_key="recommended_artists",
                         items=UniqueList(
                             [self.parse_artist(artist=artist) for artist in recommended_artists]
                         ),

music_assistant/providers/lastfm_recommendations/recommendations.py

@@ -414,7 +414,7 @@ async def _get_personalized_recommendations(self) -> AsyncIterator[Recommendatio
                 yield RecommendationFolder(
                     item_id=f"{self.provider.instance_id}_similar_artists",
                     name="Discover Similar Artists",
-                    translation_key="recommendations.discover_similar_artists",
+                    translation_key="discover_similar_artists",
                     provider=self.provider.instance_id,
                     items=UniqueList(similar_artists[:TARGET_ITEM_COUNT]),
                     subtitle=f"Based on your top {len(top_artists)} artists",
@@ -435,7 +435,7 @@ async def _get_personalized_recommendations(self) -> AsyncIterator[Recommendatio
                 yield RecommendationFolder(
                     item_id=f"{self.provider.instance_id}_similar_tracks",
                     name="Discover Similar Tracks",
-                    translation_key="recommendations.discover_similar_tracks",
+                    translation_key="discover_similar_tracks",
                     provider=self.provider.instance_id,
                     items=UniqueList(similar_tracks[:TARGET_ITEM_COUNT]),
                     subtitle=f"Based on your top {len(top_tracks)} tracks",
@@ -460,7 +460,7 @@ async def _get_global_recommendations(self) -> AsyncIterator[RecommendationFolde
                 yield RecommendationFolder(
                     item_id=f"{self.provider.instance_id}_chart_top_artists",
                     name="Global Top Artists",
-                    translation_key="recommendations.global_top_artists",
+                    translation_key="global_top_artists",
                     provider=self.provider.instance_id,
                     items=UniqueList(top_artists),
                     subtitle="Most popular artists worldwide",
@@ -479,7 +479,7 @@ async def _get_global_recommendations(self) -> AsyncIterator[RecommendationFolde
                 yield RecommendationFolder(
                     item_id=f"{self.provider.instance_id}_chart_top_tracks",
                     name="Global Top Tracks",
-                    translation_key="recommendations.global_top_tracks",
+                    translation_key="global_top_tracks",
                     provider=self.provider.instance_id,
                     items=UniqueList(top_tracks),
                     subtitle="Most popular tracks worldwide",

music_assistant/providers/opensubsonic/sonic_provider.py

@@ -831,7 +831,7 @@ async def _podcast_recommendations(self) -> RecommendationFolder:
             item_id="subsonic_newest_podcasts",
             provider=self.domain,
             name="Newest Podcast Episodes",
-            translation_key="recommendations.episodes_recently_added",
+            translation_key="episodes_recently_added",
         )
         sonic_episodes = await self.conn.get_newest_podcasts(count=self._reco_limit)
         for ep in sonic_episodes:
@@ -868,7 +868,7 @@ async def _new_recommendations(self) -> RecommendationFolder:
             item_id="subsonic_new_albums",
             provider=self.domain,
             name="New Albums",
-            translation_key="recommendations.recently_added_albums",
+            translation_key="recently_added_albums",
         )
         new_albums = await self.conn.get_album_list2(ltype="newest", size=self._reco_limit)
         for sonic_album in new_albums:
@@ -880,7 +880,7 @@ async def _played_recommendations(self) -> RecommendationFolder:
             item_id="subsonic_most_played",
             provider=self.domain,
             name="Most Played Albums",
-            translation_key="recommendations.most_played_albums",
+            translation_key="most_played_albums",
         )
         albums = await self.conn.get_album_list2(ltype="frequent", size=self._reco_limit)
         for sonic_album in albums: