Add support for beets==2.0.0

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        beets: ["1.5.0", "1.6.0"]
+        beets: ["1.5.0", "1.6.0", "2.0.0"]
     steps:
       - uses: actions/checkout@v4
 

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 - Drop support for `beets<1.5`.
 
+### Added
+
+- Add artist list fields support for `beets==2.0.0`.
+
 ### Fixed
 
 - `album`:

beetsplug/bandcamp/helpers.py

@@ -16,14 +16,21 @@
     NamedTuple,
     Pattern,
     Tuple,
+    TypeVar,
     Union,
 )
 
+from beets import __version__ as beets_version
 from beets.autotag.hooks import AlbumInfo, TrackInfo
 from ordered_set import OrderedSet as ordset  # noqa: N813
+from packaging.version import Version
 
 from .genres_lookup import GENRES
 
+BEETS_VERSION = Version(beets_version)
+ALBUMTYPES_LIST_SUPPORT = BEETS_VERSION >= Version("1.6.0")
+ARTIST_LIST_FIELDS_SUPPORT = BEETS_VERSION >= Version("2.0.0")
+
 JSONDict = Dict[str, Any]
 DIGI_MEDIA = "Digital Media"
 USB_TYPE_ID = 5
@@ -36,6 +43,8 @@
     "USB Flash Drive": DIGI_MEDIA,
 }
 
+T = TypeVar("T", bound=JSONDict)
+
 
 class MediaInfo(NamedTuple):
     album_id: str
@@ -341,6 +350,21 @@ def get_medium_total(medium: int) -> int:
                     medium_index += 1
         return album
 
+    @staticmethod
+    def check_list_fields(data: T) -> T:
+        if "albumtypes" in data and not ALBUMTYPES_LIST_SUPPORT:
+            data["albumtypes"] = "; ".join(data["albumtypes"])
+
+        if not ARTIST_LIST_FIELDS_SUPPORT:
+            fields = ["artists", "artists_ids", "artists_credit", "artists_sort"]
+            for f in fields:
+                data.pop(f)
+
+        if "tracks" in data:
+            data["tracks"] = [Helpers.check_list_fields(t) for t in data["tracks"]]
+
+        return data
+
 
 @singledispatch
 def to_dict(info: Any) -> Any:

beetsplug/bandcamp/metaguru.py

@@ -10,10 +10,8 @@
 from typing import Any, Dict, Iterable, List, Optional, Set
 from unicodedata import normalize
 
-from beets import __version__ as beets_version
 from beets import config as beets_config
 from beets.autotag.hooks import AlbumInfo, TrackInfo
-from packaging.version import Version
 from pycountry import countries, subdivisions
 
 from .album_name import AlbumName
@@ -22,9 +20,6 @@
 from .track import Track
 from .tracks import Tracks
 
-BEETS_VERSION = Version(beets_version)
-ALBUMTYPES_LIST_SUPPORT = BEETS_VERSION >= Version("1.6.0")
-
 JSONDict = Dict[str, Any]
 
 COUNTRY_OVERRIDES = {
@@ -408,10 +403,14 @@ def genre(self) -> Optional[str]:
     @property
     def _common(self) -> JSONDict:
         return {
+            "album": self.album_name,
+            "artist_id": self.artist_id,
+            "artists_credit": [],  # TODO: implement
+            "artists_ids": [self.artist_id],
+            "artists_sort": [],  # TODO: implement
             "data_source": DATA_SOURCE,
-            "media": self.media.name,
             "data_url": self.album_id,
-            "artist_id": self.artist_id,
+            "media": self.media.name,
         }
 
     def get_fields(self, fields: Iterable[str], src: object = None) -> JSONDict:
@@ -424,7 +423,7 @@ def get_fields(self, fields: Iterable[str], src: object = None) -> JSONDict:
 
     @property
     def _common_album(self) -> JSONDict:
-        common_data: JSONDict = {"album": self.album_name}
+        common_data: JSONDict = dict.fromkeys(["barcode", "release_group_title"])
         fields = [
             "albumtype",
             "albumtypes",
@@ -436,11 +435,10 @@ def _common_album(self) -> JSONDict:
             "style",
         ]
         common_data.update(self.get_fields(fields))
-        if not ALBUMTYPES_LIST_SUPPORT:
-            common_data["albumtypes"] = "; ".join(common_data["albumtypes"])
         reldate = self.release_date
         if reldate:
             common_data.update(self.get_fields(["year", "month", "day"], reldate))
+        common_data["artists"] = self.albumartist.split(", ")
 
         return common_data
 
@@ -464,9 +462,9 @@ def singleton(self) -> TrackInfo:
         self.media = self.media_formats[0]
         track = self._trackinfo(self.tracks.first)
         track.update(self._common_album)
-        track.pop("album", None)
+        track.album = None
         track.track_id = track.data_url
-        return track
+        return self.check_list_fields(track)
 
     def get_media_album(self, media: MediaInfo) -> AlbumInfo:
         """Return album for the appropriate release format."""
@@ -497,7 +495,7 @@ def get_media_album(self, media: MediaInfo) -> AlbumInfo:
         album_info.album_id = self.media.album_id
         if self.media.name == "Vinyl":
             album_info = self.add_track_alts(album_info, self.comments or "")
-        return album_info
+        return self.check_list_fields(album_info)
 
     @cached_property
     def albums(self) -> List[AlbumInfo]:

beetsplug/bandcamp/track.py

@@ -224,6 +224,12 @@ def artists(self) -> List[str]:
 
     @property
     def info(self) -> JSONDict:
+        artists = self.artists
+        if self.ft_artist:
+            artists.append(self.ft_artist)
+        # if self.remix:
+        #     artists.append(self.remix.remixer)
+
         return {
             "index": self.index,
             "medium_index": self.index,
@@ -234,6 +240,7 @@ def info(self) -> JSONDict:
                 if self.ft_artist not in self.artist + self.title
                 else self.artist
             ),
+            "artists": artists,
             "title": self.title,
             "length": self.duration,
             "track_alt": self.track_alt,

pyproject.toml

@@ -28,7 +28,7 @@ Changelog = "https://github.com/snejus/beetcamp/blob/master/CHANGELOG.md"
 python = ">=3.8, <4"
 
 pycountry = ">=20.7.3"
-beets = ">=1.5,<=2"
+beets = ">=1.5"
 httpx = ">=0.27.0"
 ordered-set = ">=4.0"
 packaging = ">=24.0"

tests/conftest.py

@@ -14,7 +14,7 @@
 from rich_tables.utils import make_console, pretty_diff
 
 from beetsplug.bandcamp import DEFAULT_CONFIG
-from beetsplug.bandcamp.metaguru import ALBUMTYPES_LIST_SUPPORT
+from beetsplug.bandcamp.helpers import Helpers
 
 if TYPE_CHECKING:
     from _pytest.config import Config
@@ -194,15 +194,9 @@ def expected_release(bandcamp_data_path: Path) -> list[AlbumInfo] | TrackInfo |
     release_data = json.loads(release_datastr)
 
     if isinstance(release_data, dict):
-        if ALBUMTYPES_LIST_SUPPORT:
-            release_data["albumtypes"] = release_data["albumtypes"].split("; ")
-        return TrackInfo(**release_data)
+        return Helpers.check_list_fields(TrackInfo(**release_data))
 
-    if ALBUMTYPES_LIST_SUPPORT:
-        for release in release_data:
-            release["albumtypes"] = release["albumtypes"].split("; ")
-
-    return [AlbumInfo(**r) for r in release_data]
+    return [Helpers.check_list_fields(AlbumInfo(**r)) for r in release_data]
 
 
 @pytest.fixture