Apply suggestions from code review

Co-authored-by: Šarūnas Nejus <[email protected]>

Author: aereaux

beetsplug/musicbrainz.py

@@ -363,6 +363,10 @@ def _merge_pseudo_and_actual_album(
 
 
 class MusicBrainzPlugin(MetadataSourcePlugin):
+    @cached_property
+    def genres_field(self) -> str | None:
+        return f"{config['musicbrainz']['genres_tag'].get()}-list"
+
     def __init__(self):
         """Set up the python-musicbrainz-ngs module according to settings
         from the beets configuration. This should be called at startup.
@@ -375,6 +379,7 @@ def __init__(self):
                 "ratelimit": 1,
                 "ratelimit_interval": 1,
                 "genres": False,
+                "genres_tag": "genre",
                 "external_ids": {
                     "discogs": False,
                     "bandcamp": False,
@@ -404,17 +409,6 @@ def __init__(self):
             self.config["ratelimit_interval"].as_number(),
             self.config["ratelimit"].get(int),
         )
-        genres_config = config["musicbrainz"]["genres"]
-        if genres_config:
-            genres_config = genres_config.get(str)
-            if genres_config == "genres":
-                self.genre_or_tag = "genre"
-            elif genres_config == "tags":
-                self.genre_or_tag = "tag"
-            else:
-                self.genre_or_tag = "genre"
-        else:
-            self.genre_or_tag = False
 
     def track_info(
         self,
@@ -725,10 +719,10 @@ def album_info(self, release: JSONDict) -> beets.autotag.hooks.AlbumInfo:
             else:
                 info.media = "Media"
 
-        if self.genre_or_tag:
+        if self.config["genres"]:
             sources = [
-                release["release-group"].get(self.genre_or_tag + "-list", []),
-                release.get(self.genre_or_tag + "-list", []),
+                release["release-group"].get(self.genres_field, []),
+                release.get(self.genres_field, []),
             ]
             genres: Counter[str] = Counter()
             for source in sources:

docs/plugins/musicbrainz.rst

@@ -30,6 +30,7 @@ Default
         search_limit: 5
         extra_tags: []
         genres: no
+        genres_tag: genre
         external_ids:
             discogs: no
             bandcamp: no
@@ -129,6 +130,16 @@ Use MusicBrainz genre tags to populate (and replace if it's already set) the
 and the release-group on MusicBrainz, separated by "; " and sorted by the total
 number of votes. Default: ``no``
 
+.. _genres_tag:
+
+genres_tag
+++++++++++
+
+Either ``genres`` or ``tags``.  Specify ``genres`` to use just musicbrainz genres
+and ``tags`` to use all user-supplied musicbrainz tags.
+
+Default: ``genres``
+
 .. _musicbrainz.external_ids:
 
 external_ids