From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Thu, 19 May 2022 18:20:03 +0000 (+0200)
Subject: Fix for parsing metadata from nfo files (#329)
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=54b8e523141d460acabf2930af5c06a81ee0c982;p=music-assistant-server.git

Fix for parsing metadata from nfo files (#329)
---

diff --git a/music_assistant/controllers/music/providers/filesystem.py b/music_assistant/controllers/music/providers/filesystem.py
index 36304c4c..60e797fe 100644
--- a/music_assistant/controllers/music/providers/filesystem.py
+++ b/music_assistant/controllers/music/providers/filesystem.py
@@ -589,12 +589,6 @@ class FileSystemProvider(MusicProvider):
                 artist.metadata.description = descripton
             if genre := info.get("genre"):
                 artist.metadata.genres = set(split_items(genre))
-            if not artist.musicbrainz_id:
-                for uid in info.get("uniqueid") or []:
-                    if not uid.get("@type"):
-                        continue
-                    if uid["@type"] == "MusicBrainzArtist":
-                        artist.musicbrainz_id = uid["#text"]
         # find local images
         images = []
         for _filename in os.listdir(artist_path):
@@ -669,21 +663,15 @@ class FileSystemProvider(MusicProvider):
                 album.sort_name = sort_name
             if musicbrainz_id := info.get("musicbrainzreleasegroupid"):
                 album.musicbrainz_id = musicbrainz_id
+            if mb_artist_id := info.get("musicbrainzalbumartistid"):
+                if album.artist and not album.artist.musicbrainz_id:
+                    album.artist.musicbrainz_id = mb_artist_id
             if description := info.get("review"):
                 album.metadata.description = description
             if year := info.get("label"):
                 album.year = int(year)
             if genre := info.get("genre"):
                 album.metadata.genres = set(split_items(genre))
-            for uid in info.get("uniqueid") or []:
-                if not uid.get("@type"):
-                    continue
-                if uid["@type"] == "MusicBrainzReleaseGroup":
-                    if not album.musicbrainz_id:
-                        album.musicbrainz_id = uid["#text"]
-                if uid["@type"] == "MusicBrainzAlbumArtist":
-                    if album.artist and not album.artist.musicbrainz_id:
-                        album.artist.musicbrainz_id = uid["#text"]
         # parse name/version
         album.name, album.version = parse_title_and_version(album.name)
         # find local images