From a65616a21b34cc589347276ec7a729fdeb565d83 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Thu, 3 Oct 2024 09:07:04 +0200 Subject: [PATCH] some minor tweaks --- music_assistant/server/helpers/ffmpeg.py | 2 +- tests/server/test_compare.py | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/music_assistant/server/helpers/ffmpeg.py b/music_assistant/server/helpers/ffmpeg.py index 392f2cee..de0b4e75 100644 --- a/music_assistant/server/helpers/ffmpeg.py +++ b/music_assistant/server/helpers/ffmpeg.py @@ -133,7 +133,7 @@ class FFMpeg(AsyncProcess): return self.logger.error( "Stream error: %s", - str(err), + str(err) or err.__class__.__name__, exc_info=err if self.logger.isEnabledFor(VERBOSE_LOG_LEVEL) else None, ) finally: diff --git a/tests/server/test_compare.py b/tests/server/test_compare.py index d7af00e9..ff9eaad0 100644 --- a/tests/server/test_compare.py +++ b/tests/server/test_compare.py @@ -67,6 +67,30 @@ def test_compare_artist() -> None: artist_b.name = artist_a.name artist_b.external_ids = {(media_items.ExternalID.MB_ARTIST, "1234")} assert compare.compare_artist(artist_a, artist_b) is False + # test on external id mismatch while name matches + artist_a = media_items.Artist( + item_id="1", + provider="test1", + name="Artist A", + external_ids={(media_items.ExternalID.MB_ARTIST, "123")}, + provider_mappings={ + media_items.ProviderMapping( + item_id="1", provider_domain="test", provider_instance="test1" + ) + }, + ) + artist_b = media_items.Artist( + item_id="1", + provider="test2", + name="Artist A", + external_ids={(media_items.ExternalID.MB_ARTIST, "abc")}, + provider_mappings={ + media_items.ProviderMapping( + item_id="2", provider_domain="test", provider_instance="test2" + ) + }, + ) + assert compare.compare_artist(artist_a, artist_b) is False def test_compare_album() -> None: -- 2.34.1