An opinionated fix for "the albumtype(s) problem"

beets/autotag/hooks.py

@@ -87,7 +87,6 @@ def __init__(
         artists: Optional[List[str]] = None,
         artists_ids: Optional[List[str]] = None,
         asin: Optional[str] = None,
-        albumtype: Optional[str] = None,
         albumtypes: Optional[List[str]] = None,
         va: bool = False,
         year: Optional[int] = None,
@@ -129,7 +128,6 @@ def __init__(
         self.artists_ids = artists_ids or []
         self.tracks = tracks
         self.asin = asin
-        self.albumtype = albumtype
         self.albumtypes = albumtypes or []
         self.va = va
         self.year = year
@@ -173,7 +171,6 @@ def decode(self, codec: str = "utf-8"):
         for fld in [
             "album",
             "artist",
-            "albumtype",
             "label",
             "artist_sort",
             "catalognum",

beets/autotag/mb.py

@@ -554,8 +554,11 @@ def album_info(release: Dict) -> beets.autotag.hooks.AlbumInfo:
     # feature before MusicBrainz supported multiple release types.
     if "type" in release["release-group"]:
         reltype = release["release-group"]["type"]
-        if reltype:
-            info.albumtype = reltype.lower()
+        log.debug(
+            "MusicBrainz release-group.type received but ignoring in favor of"
+            "new-style primary/secondary release-types:",
+            reltype,
+        )
 
     # Set the new-style "primary" and "secondary" release types.
     albumtypes = []

beets/config_default.yaml

@@ -83,7 +83,7 @@ replace:
 
 aunique:
     keys: albumartist album
-    disambiguators: albumtype year label catalognum albumdisambig releasegroupdisambig
+    disambiguators: year label catalognum albumdisambig releasegroupdisambig
     bracket: '[]'
 
 sunique:

beets/library.py

@@ -559,7 +559,6 @@ class Item(LibModel):
         "mb_albumartistids": types.MULTI_VALUE_DSV,
         "mb_releasetrackid": types.STRING,
         "trackdisambig": types.STRING,
-        "albumtype": types.STRING,
         "albumtypes": types.SEMICOLON_SPACE_DSV,
         "label": types.STRING,
         "acoustid_fingerprint": types.STRING,
@@ -1159,7 +1158,6 @@ class Album(LibModel):
         "comp": types.BOOLEAN,
         "mb_albumid": types.STRING,
         "mb_albumartistid": types.STRING,
-        "albumtype": types.STRING,
         "albumtypes": types.SEMICOLON_SPACE_DSV,
         "label": types.STRING,
         "mb_releasegroupid": types.STRING,
@@ -1214,7 +1212,6 @@ class Album(LibModel):
         "comp",
         "mb_albumid",
         "mb_albumartistid",
-        "albumtype",
         "albumtypes",
         "label",
         "mb_releasegroupid",

beetsplug/deezer.py

@@ -147,7 +147,7 @@ def album_for_id(self, album_id):
             artist_credit=self.get_artist([album_data["artist"]])[0],
             artist_id=artist_id,
             tracks=tracks,
-            albumtype=album_data["record_type"],
+            albumtypes=[album_data["record_type"]],
             va=len(album_data["contributors"]) == 1
             and artist.lower() == "various artists",
             year=year,

beetsplug/discogs.py

@@ -413,12 +413,9 @@ def get_album_info(self, result):
 
         # Extract information for the optional AlbumInfo fields that are
         # contained on nested discogs fields.
-        albumtype = media = label = catalogno = labelid = None
+        albumtypes = media = label = catalogno = labelid = None
         if result.data.get("formats"):
-            albumtype = (
-                ", ".join(result.data["formats"][0].get("descriptions", []))
-                or None
-            )
+            albumtypes = result.data["formats"][0].get("descriptions", [])
             media = result.data["formats"][0]["name"]
         if result.data.get("labels"):
             label = result.data["labels"][0].get("name")
@@ -459,7 +456,7 @@ def get_album_info(self, result):
             artist=artist,
             artist_id=artist_id,
             tracks=tracks,
-            albumtype=albumtype,
+            albumtypes=albumtypes,
             va=va,
             year=year,
             label=label,

beetsplug/spotify.py

@@ -301,7 +301,7 @@ def album_for_id(self, album_id):
             artist_id=artist_id,
             spotify_artist_id=artist_id,
             tracks=tracks,
-            albumtype=album_data["album_type"],
+            albumtypes=[album_data["album_type"]],
             va=len(album_data["artists"]) == 1
             and artist.lower() == "various artists",
             year=year,