From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Thu, 18 Apr 2024 22:40:46 +0000 (+0200)
Subject: mark more musicbrainz fields as optional
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=75a9cab6083e43b14319f78761f6fc0758f8cf68;p=music-assistant-server.git

mark more musicbrainz fields as optional
---

diff --git a/music_assistant/server/helpers/tags.py b/music_assistant/server/helpers/tags.py
index 60d77798..047f022d 100644
--- a/music_assistant/server/helpers/tags.py
+++ b/music_assistant/server/helpers/tags.py
@@ -29,7 +29,7 @@ LOGGER = logging.getLogger(f"{MASS_LOGGER_NAME}.tags")
 TAG_SPLITTER = ";"
 
 
-def split_items(org_str: str, split_slash: bool = False) -> tuple[str, ...]:
+def split_items(org_str: str, allow_unsafe_splitters: bool = False) -> tuple[str, ...]:
     """Split up a tags string by common splitter."""
     if org_str is None:
         return ()
@@ -38,8 +38,10 @@ def split_items(org_str: str, split_slash: bool = False) -> tuple[str, ...]:
     org_str = org_str.strip()
     if TAG_SPLITTER in org_str:
         return tuple(x.strip() for x in org_str.split(TAG_SPLITTER))
-    if split_slash and "/" in org_str:
+    if allow_unsafe_splitters and "/" in org_str:
         return tuple(x.strip() for x in org_str.split("/"))
+    if allow_unsafe_splitters and ", " in org_str:
+        return tuple(x.strip() for x in org_str.split(", "))
     return (org_str.strip(),)
 
 
diff --git a/music_assistant/server/providers/musicbrainz/__init__.py b/music_assistant/server/providers/musicbrainz/__init__.py
index 11d8398b..95762cf5 100644
--- a/music_assistant/server/providers/musicbrainz/__init__.py
+++ b/music_assistant/server/providers/musicbrainz/__init__.py
@@ -131,11 +131,11 @@ class MusicBrainzReleaseGroup(DataClassDictMixin):
     """Model for a (basic) ReleaseGroup object from MusicBrainz."""
 
     id: str
-    primary_type_id: str
     title: str
-    primary_type: str
 
     # optional fields
+    primary_type: str | None = None
+    primary_type_id: str | None = None
     secondary_types: list[str] | None = None
     secondary_type_ids: list[str] | None = None
     artist_credit: list[MusicBrainzArtistCredit] | None = None