Allow selecting either tags or genres in the includes, defaulting to genres

Genres is a filtered list based on what musicbrainz considers a genre,
tags are all the user-submitted tags. [1]

1. https://musicbrainz.org/doc/MusicBrainz_API#:~:text=Since%20genres%20are,!).

Author: aereaux

beetsplug/musicbrainz.py

@@ -89,6 +89,7 @@ def get_message(self):
         "isrcs",
         "url-rels",
         "release-rels",
+        "genres",
         "tags",
     }
     & set(musicbrainzngs.VALID_INCLUDES["release"])
@@ -395,6 +396,17 @@ 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,
@@ -705,10 +717,10 @@ def album_info(self, release: JSONDict) -> beets.autotag.hooks.AlbumInfo:
             else:
                 info.media = "Media"
 
-        if self.config["genres"]:
+        if self.genre_or_tag:
             sources = [
-                release["release-group"].get("tag-list", []),
-                release.get("tag-list", []),
+                release["release-group"].get(self.genre_or_tag + "-list", []),
+                release.get(self.genre_or_tag + "-list", []),
             ]
             genres: Counter[str] = Counter()
             for source in sources:

docs/changelog.rst

@@ -33,6 +33,7 @@ New features:
 * :doc:`plugins/mpdstats`: Add new configuration option,
   ``played_ratio_threshold``, to allow configuring the percentage the song must
   be played for it to be counted as played instead of skipped.
+* :doc:`plugins/musicbrainz`: Allow selecting tags or genres to populate the genres tag.
 
 Bug fixes:
 

docs/plugins/musicbrainz.rst

@@ -120,7 +120,8 @@ genres
 Use MusicBrainz genre tags to populate (and replace if it's already set) the
 ``genre`` tag.  This will make it a list of all the genres tagged for the
 release and the release-group on MusicBrainz, separated by "; " and sorted by
-the total number of votes.
+the total number of votes.  Specify "genres" to use just musicbrainz genres and
+"tags" to use all user-supplied musicbrainz tags.
 Default: ``no``
 
 .. _musicbrainz.external_ids: