From: micha91 <michael.harbarth@gmx.de>
Date: Fri, 14 Apr 2023 13:07:37 +0000 (+0200)
Subject: Add Plex Track Artist for compilations (#617)
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=a9299c149ba2e675276b2f8876887b8cdad221b1;p=music-assistant-server.git

Add Plex Track Artist for compilations (#617)

* Use track artist if album artist is different from track artist.

* Some reformatting

---------

Co-authored-by: Marcel van der Veldt <m.vanderveldt@outlook.com>
---

diff --git a/music_assistant/server/providers/plex/__init__.py b/music_assistant/server/providers/plex/__init__.py
index 982125fc..15d6a0e5 100644
--- a/music_assistant/server/providers/plex/__init__.py
+++ b/music_assistant/server/providers/plex/__init__.py
@@ -57,6 +57,8 @@ CONF_ACTION_LIBRARY = "library"
 CONF_AUTH_TOKEN = "token"
 CONF_LIBRARY_ID = "library_id"
 
+FAKE_ARTIST_PREFIX = "_fake://"
+
 
 async def setup(
     mass: MusicAssistant, manifest: ProviderManifest, config: ProviderConfig
@@ -208,6 +210,29 @@ class PlexProvider(MusicProvider):
             name,
         )
 
+    async def _get_or_create_artist_by_name(self, artist_name) -> Artist:
+        query = (
+            "SELECT * FROM artists WHERE name = :name AND provider_mappings = :provider_instance"
+        )
+        params = {
+            "name": f"%{artist_name}%",
+            "provider_instance": f"%{self.instance_id}%",
+        }
+        db_artists = await self.mass.music.artists.get_db_items_by_query(query, params)
+        if db_artists:
+            return ItemMapping.from_item(db_artists[0])
+
+        artist_id = FAKE_ARTIST_PREFIX + artist_name
+        artist = Artist(item_id=artist_id, name=artist_name, provider=self.domain)
+        artist.add_provider_mapping(
+            ProviderMapping(
+                item_id=str(artist_id),
+                provider_domain=self.domain,
+                provider_instance=self.instance_id,
+            )
+        )
+        return artist
+
     async def _parse(self, plex_media) -> MediaItem | None:
         if plex_media.type == "artist":
             return await self._parse_artist(plex_media)
@@ -336,12 +361,20 @@ class PlexProvider(MusicProvider):
         """Parse a Plex Track response to a Track model object."""
         track = Track(item_id=plex_track.key, provider=self.instance_id, name=plex_track.title)
 
-        if plex_track.grandparentKey:
+        if plex_track.originalTitle and plex_track.originalTitle != plex_track.grandparentTitle:
+            # The artist of the track if different from the album's artist.
+            # For this kind of artist, we just know the name, so we create a fake artist,
+            # if it does not already exist.
+            track.artists.append(await self._get_or_create_artist_by_name(plex_track.originalTitle))
+        elif plex_track.grandparentKey:
             track.artists.append(
                 self._get_item_mapping(
                     MediaType.ARTIST, plex_track.grandparentKey, plex_track.grandparentTitle
                 )
             )
+        else:
+            raise InvalidDataError("No artist was found for track")
+
         if thumb := plex_track.firstAttr("thumb", "parentThumb", "grandparentThumb"):
             track.metadata.images = [MediaItemImage(ImageType.THUMB, thumb, self.instance_id)]
         if plex_track.parentKey:
@@ -473,6 +506,15 @@ class PlexProvider(MusicProvider):
 
     async def get_artist(self, prov_artist_id) -> Artist:
         """Get full artist details by id."""
+        if prov_artist_id.startswith(FAKE_ARTIST_PREFIX):
+            # This artist does not exist in plex, so we can just load it from DB.
+
+            if db_artist := await self.mass.music.artists.get_db_item_by_prov_id(
+                prov_artist_id, self.instance_id
+            ):
+                return db_artist
+            raise MediaNotFoundError(f"Artist not found: {prov_artist_id}")
+
         if plex_artist := await self._get_data(prov_artist_id, PlexArtist):
             return await self._parse_artist(plex_artist)
         raise MediaNotFoundError(f"Item {prov_artist_id} not found")
@@ -507,13 +549,14 @@ class PlexProvider(MusicProvider):
 
     async def get_artist_albums(self, prov_artist_id) -> list[Album]:
         """Get a list of albums for the given artist."""
-        plex_artist = await self._get_data(prov_artist_id, PlexArtist)
-        plex_albums = await self._run_async(plex_artist.albums)
-        if plex_albums:
-            albums = []
-            for album_obj in plex_albums:
-                albums.append(await self._parse_album(album_obj))
-            return albums
+        if not prov_artist_id.startswith(FAKE_ARTIST_PREFIX):
+            plex_artist = await self._get_data(prov_artist_id, PlexArtist)
+            plex_albums = await self._run_async(plex_artist.albums)
+            if plex_albums:
+                albums = []
+                for album_obj in plex_albums:
+                    albums.append(await self._parse_album(album_obj))
+                return albums
         return []
 
     async def get_stream_details(self, item_id: str) -> StreamDetails | None: