From fa98ac53032fc8ce67d7960db8f06c97f276d2c7 Mon Sep 17 00:00:00 2001 From: heyarne Date: Wed, 16 Dec 2020 12:58:29 +0100 Subject: [PATCH 1/2] Omit recording_mbid if no data is available; fixes https://dev.funkwhale.audio/funkwhale/funkwhale/-/issues/1310 --- api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py b/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py index ec984b447..c546fa39f 100644 --- a/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py +++ b/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py @@ -22,11 +22,13 @@ def get_track(track): album = None additional_info = { "listening_from": "Funkwhale", - "recording_mbid": str(track.mbid), "tracknumber": track.position, "discnumber": track.disc_number, } + if track.mbid: + additional_info["recording_mbid"] = str(track.mbid), + if track.album: if track.album.title: album = track.album.title -- GitLab From 0f39b50d467f601177d2aa1d8380ab8974767a0b Mon Sep 17 00:00:00 2001 From: heyarne Date: Wed, 16 Dec 2020 13:29:49 +0100 Subject: [PATCH 2/2] Fix linter warnings --- api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py b/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py index c546fa39f..fbaaf94b3 100644 --- a/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py +++ b/api/funkwhale_api/contrib/listenbrainz/funkwhale_ready.py @@ -27,7 +27,7 @@ def get_track(track): } if track.mbid: - additional_info["recording_mbid"] = str(track.mbid), + additional_info["recording_mbid"] = str(track.mbid) if track.album: if track.album.title: -- GitLab