diff --git a/beetsplug/musicbrainz.py b/beetsplug/musicbrainz.py index 3f3ce4bea..906798341 100644 --- a/beetsplug/musicbrainz.py +++ b/beetsplug/musicbrainz.py @@ -598,6 +598,9 @@ class MusicBrainzPlugin(MusicBrainzAPIMixin, MetadataSourcePlugin): genre=genre if (genre := self._parse_genre(release)) else None, script=release["text_representation"]["script"], language=release["text_representation"]["language"], + asin=release["asin"], + albumstatus=release["status"], + albumdisambig=release["disambiguation"] or None, **self._parse_release_group(release["release_group"]), **self._parse_label_infos(release["label_info"]), **self._parse_external_ids(release.get("url_relations", [])), @@ -605,11 +608,6 @@ class MusicBrainzPlugin(MusicBrainzAPIMixin, MetadataSourcePlugin): info.va = info.artist_id == VARIOUS_ARTISTS_ID if info.va: info.artist = config["va_name"].as_str() - info.asin = release.get("asin") - info.albumstatus = release.get("status") - - if release.get("disambiguation"): - info.albumdisambig = release.get("disambiguation") # Release events. info.country, release_date = _preferred_release_event(release) diff --git a/test/plugins/test_musicbrainz.py b/test/plugins/test_musicbrainz.py index 7507a60c6..6817d6292 100644 --- a/test/plugins/test_musicbrainz.py +++ b/test/plugins/test_musicbrainz.py @@ -106,7 +106,7 @@ class MusicBrainzTestCase(BeetsTestCase): "label_info": [label_info_factory()], "text_representation": text_representation_factory(), "country": "COUNTRY", - "status": "STATUS", + "status": "Official", "barcode": "BARCODE", "release_events": [ release_event_factory(area=None, date="2021-03-26"), @@ -387,7 +387,7 @@ class MBAlbumInfoTest(MusicBrainzTestCase): def test_parse_status(self): release = self._make_release() d = self.mb.album_info(release) - assert d.albumstatus == "STATUS" + assert d.albumstatus == "Official" def test_parse_barcode(self): release = self._make_release() @@ -796,6 +796,8 @@ class MBLibraryTest(MusicBrainzTestCase): "title": "pseudo", "id": "d2a6f856-b553-40a0-ac54-a321e8e2da02", "status": "Pseudo-Release", + "asin": None, + "disambiguation": "", "media": [ { "tracks": [ @@ -829,6 +831,8 @@ class MBLibraryTest(MusicBrainzTestCase): "title": "actual", "id": "d2a6f856-b553-40a0-ac54-a321e8e2da01", "status": "Official", + "asin": None, + "disambiguation": "", "media": [ { "tracks": [ @@ -865,6 +869,8 @@ class MBLibraryTest(MusicBrainzTestCase): "title": "pseudo", "id": "d2a6f856-b553-40a0-ac54-a321e8e2da02", "status": "Pseudo-Release", + "asin": None, + "disambiguation": "", "media": [ { "tracks": [ @@ -900,6 +906,8 @@ class MBLibraryTest(MusicBrainzTestCase): "title": "pseudo", "id": "d2a6f856-b553-40a0-ac54-a321e8e2da02", "status": "Pseudo-Release", + "asin": None, + "disambiguation": "", "media": [ { "tracks": [ @@ -935,6 +943,8 @@ class MBLibraryTest(MusicBrainzTestCase): "title": "pseudo", "id": "d2a6f856-b553-40a0-ac54-a321e8e2da02", "status": "Pseudo-Release", + "asin": None, + "disambiguation": "", "media": [ { "tracks": [ @@ -1043,7 +1053,9 @@ class TestMusicBrainzPlugin(PluginMixin): lambda *_, **__: { "title": "hi", "id": self.mbid, - "status": "status", + "status": "Official", + "asin": None, + "disambiguation": "", "media": [ { "tracks": [