From: Marcel van der Veldt Date: Tue, 18 Feb 2025 14:43:03 +0000 (+0100) Subject: Follow-up fix for multi item parsing from tags X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=035cb3fb31807bd176588e7444f058ec9b02b93e;p=music-assistant-server.git Follow-up fix for multi item parsing from tags --- diff --git a/music_assistant/helpers/tags.py b/music_assistant/helpers/tags.py index 54256547..590a1dc1 100644 --- a/music_assistant/helpers/tags.py +++ b/music_assistant/helpers/tags.py @@ -42,7 +42,10 @@ def split_items(org_str: str, allow_unsafe_splitters: bool = False) -> tuple[str if org_str is None: return () if isinstance(org_str, list): - return tuple(x.strip() for x in org_str) + final_items: list[str] = [] + for item in org_str: + final_items.extend(split_items(item, allow_unsafe_splitters)) + return tuple(final_items) org_str = org_str.strip() if TAG_SPLITTER in org_str: return clean_tuple(org_str.split(TAG_SPLITTER)) @@ -64,7 +67,7 @@ def split_artists( splitters = ("featuring", " feat. ", " feat ", "feat.") if allow_ampersand: splitters = (*splitters, " & ") - artists = split_items(org_artists) + artists = split_items(org_artists, allow_unsafe_splitters=False) for item in artists: for splitter in splitters: if splitter not in item: diff --git a/tests/fixtures/MyArtist - MyTitle.mp3 b/tests/fixtures/MyArtist - MyTitle.mp3 index 42319c42..57179680 100644 Binary files a/tests/fixtures/MyArtist - MyTitle.mp3 and b/tests/fixtures/MyArtist - MyTitle.mp3 differ