From 4d5b60fddea7cabe52db26ff85fba530cf0d1b80 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Mon, 20 Mar 2023 10:18:30 +0100 Subject: [PATCH] Various small fixes and improvements (#553) --- music_assistant/server/providers/filesystem_local/base.py | 4 +++- music_assistant/server/providers/ytmusic/__init__.py | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/music_assistant/server/providers/filesystem_local/base.py b/music_assistant/server/providers/filesystem_local/base.py index 014a276c..b1eceda5 100644 --- a/music_assistant/server/providers/filesystem_local/base.py +++ b/music_assistant/server/providers/filesystem_local/base.py @@ -291,6 +291,8 @@ class FileSystemProviderBase(MusicProvider): # playlist is always in-library playlist.in_library = True await self.mass.music.playlists.add_db_item(playlist) + except MusicAssistantError as err: + self.logger.error("Error processing %s - %s", item.path, str(err)) except Exception as err: # pylint: disable=broad-except # we don't want the whole sync to crash on one file so we catch all exceptions here self.logger.exception("Error processing %s - %s", item.path, str(err)) @@ -409,7 +411,7 @@ class FileSystemProviderBase(MusicProvider): ] else: # default action is to skip the track - raise InvalidDataError(f"{file_item.path} is missing ID3 tag [albumartist]") + raise InvalidDataError("missing ID3 tag [albumartist]") track.album = await self._parse_album( tags.album, diff --git a/music_assistant/server/providers/ytmusic/__init__.py b/music_assistant/server/providers/ytmusic/__init__.py index f76dbbbd..0cdf7349 100644 --- a/music_assistant/server/providers/ytmusic/__init__.py +++ b/music_assistant/server/providers/ytmusic/__init__.py @@ -545,7 +545,12 @@ class YoutubeMusicProvider(MusicProvider): ) ) if authors := playlist_obj.get("author"): - playlist.owner = authors[0]["name"] if isinstance(authors, list) else authors["name"] + if isinstance(authors, str): + playlist.owner = authors + elif isinstance(authors, list): + playlist.owner = authors[0]["name"] + else: + playlist.owner = authors["name"] else: playlist.owner = self.instance_id playlist.metadata.checksum = playlist_obj.get("checksum") -- 2.34.1