mirror of
https://github.com/beetbox/beets.git
synced 2026-01-14 20:24:36 +01:00
expand tests to include check for track artists
This commit is contained in:
parent
9cbbad19f8
commit
a7170fae45
4 changed files with 177 additions and 15 deletions
|
|
@ -304,7 +304,7 @@ class SpotifyPlugin(
|
|||
|
||||
def _multi_artist_credit(
|
||||
self, artists: list[dict[str | int, str]]
|
||||
) -> tuple[list[str], list[str | None]]:
|
||||
) -> tuple[list[str], list[str]]:
|
||||
"""Given a list of artist dictionaries, accumulate data into a pair
|
||||
of lists: the first being the artist names, and the second being the
|
||||
artist IDs.
|
||||
|
|
@ -312,11 +312,8 @@ class SpotifyPlugin(
|
|||
artist_names = []
|
||||
artist_ids = []
|
||||
for artist in artists:
|
||||
# Still use the get_artist helper to handle the artical
|
||||
# normalization for each individual artist.
|
||||
name, id = self.get_artist([artist])
|
||||
artist_names.append(name)
|
||||
artist_ids.append(id)
|
||||
artist_names.append(artist["name"])
|
||||
artist_ids.append(artist["id"])
|
||||
return artist_names, artist_ids
|
||||
|
||||
def album_for_id(self, album_id: str) -> AlbumInfo | None:
|
||||
|
|
|
|||
|
|
@ -251,20 +251,36 @@ class SpotifyPluginTest(PluginTestCase):
|
|||
assert query.isascii()
|
||||
|
||||
@responses.activate
|
||||
def test_multi_artist_album(self):
|
||||
"""Tests if plugin is able to map multiple artists in an album"""
|
||||
def test_multiartist_album_and_track(self):
|
||||
"""Tests if plugin is able to map multiple artists in an album and
|
||||
track info correctly"""
|
||||
|
||||
# Mock the Spotify 'Get Album' call
|
||||
json_file = os.path.join(
|
||||
_common.RSRC, b"spotify", b"multi_artist_request.json"
|
||||
_common.RSRC, b"spotify", b"multiartist_album.json"
|
||||
)
|
||||
with open(json_file, "rb") as f:
|
||||
response_body = f.read()
|
||||
album_response_body = f.read()
|
||||
|
||||
responses.add(
|
||||
responses.GET,
|
||||
f"{spotify.SpotifyPlugin.album_url}0yhKyyjyKXWUieJ4w1IAEa",
|
||||
body=response_body,
|
||||
body=album_response_body,
|
||||
status=200,
|
||||
content_type="application/json",
|
||||
)
|
||||
|
||||
# Mock the Spotify 'Get Track' call
|
||||
json_file = os.path.join(
|
||||
_common.RSRC, b"spotify", b"multiartist_track.json"
|
||||
)
|
||||
with open(json_file, "rb") as f:
|
||||
track_response_body = f.read()
|
||||
|
||||
responses.add(
|
||||
responses.GET,
|
||||
f"{spotify.SpotifyPlugin.track_url}6sjZfVJworBX6TqyjkxIJ1",
|
||||
body=track_response_body,
|
||||
status=200,
|
||||
content_type="application/json",
|
||||
)
|
||||
|
|
@ -273,3 +289,21 @@ class SpotifyPluginTest(PluginTestCase):
|
|||
assert album_info is not None
|
||||
assert album_info.artist == "Project Skylate, Sugar Shrill"
|
||||
assert album_info.artists == ["Project Skylate", "Sugar Shrill"]
|
||||
assert album_info.artist_id == "6m8MRXIVKb6wQaPlBIDMr1"
|
||||
assert album_info.artists_ids == [
|
||||
"6m8MRXIVKb6wQaPlBIDMr1",
|
||||
"4kkAIoQmNT5xEoNH5BuQLe",
|
||||
]
|
||||
|
||||
assert len(album_info.tracks) == 1
|
||||
assert album_info.tracks[0].artist == "Foo, Bar"
|
||||
assert album_info.tracks[0].artists == ["Foo", "Bar"]
|
||||
assert album_info.tracks[0].artist_id == "12345"
|
||||
assert album_info.tracks[0].artists_ids == ["12345", "67890"]
|
||||
|
||||
track_info = self.spotify.track_for_id("6sjZfVJworBX6TqyjkxIJ1")
|
||||
assert track_info is not None
|
||||
assert track_info.artist == "Foo, Bar"
|
||||
assert track_info.artists == ["Foo", "Bar"]
|
||||
assert track_info.artist_id == "12345"
|
||||
assert track_info.artists_ids == ["12345", "67890"]
|
||||
|
|
|
|||
|
|
@ -83,8 +83,8 @@
|
|||
"spotify": "https://open.spotify.com/artist/6m8MRXIVKb6wQaPlBIDMr1"
|
||||
},
|
||||
"href": "https://api.spotify.com/v1/artists/6m8MRXIVKb6wQaPlBIDMr1",
|
||||
"id": "6m8MRXIVKb6wQaPlBIDMr1",
|
||||
"name": "Project Skylate",
|
||||
"id": "12345",
|
||||
"name": "Foo",
|
||||
"type": "artist",
|
||||
"uri": "spotify:artist:6m8MRXIVKb6wQaPlBIDMr1"
|
||||
},
|
||||
|
|
@ -93,8 +93,8 @@
|
|||
"spotify": "https://open.spotify.com/artist/4kkAIoQmNT5xEoNH5BuQLe"
|
||||
},
|
||||
"href": "https://api.spotify.com/v1/artists/4kkAIoQmNT5xEoNH5BuQLe",
|
||||
"id": "4kkAIoQmNT5xEoNH5BuQLe",
|
||||
"name": "Sugar Shrill",
|
||||
"id": "67890",
|
||||
"name": "Bar",
|
||||
"type": "artist",
|
||||
"uri": "spotify:artist:4kkAIoQmNT5xEoNH5BuQLe"
|
||||
}
|
||||
131
test/rsrc/spotify/multiartist_track.json
Normal file
131
test/rsrc/spotify/multiartist_track.json
Normal file
|
|
@ -0,0 +1,131 @@
|
|||
{
|
||||
"album": {
|
||||
"album_type": "single",
|
||||
"artists": [
|
||||
{
|
||||
"external_urls": {
|
||||
"spotify": "https://open.spotify.com/artist/6m8MRXIVKb6wQaPlBIDMr1"
|
||||
},
|
||||
"href": "https://api.spotify.com/v1/artists/6m8MRXIVKb6wQaPlBIDMr1",
|
||||
"id": "6m8MRXIVKb6wQaPlBIDMr1",
|
||||
"name": "Project Skylate",
|
||||
"type": "artist",
|
||||
"uri": "spotify:artist:6m8MRXIVKb6wQaPlBIDMr1"
|
||||
},
|
||||
{
|
||||
"external_urls": {
|
||||
"spotify": "https://open.spotify.com/artist/4kkAIoQmNT5xEoNH5BuQLe"
|
||||
},
|
||||
"href": "https://api.spotify.com/v1/artists/4kkAIoQmNT5xEoNH5BuQLe",
|
||||
"id": "4kkAIoQmNT5xEoNH5BuQLe",
|
||||
"name": "Sugar Shrill",
|
||||
"type": "artist",
|
||||
"uri": "spotify:artist:4kkAIoQmNT5xEoNH5BuQLe"
|
||||
}
|
||||
],
|
||||
"available_markets": [
|
||||
"AR", "AU", "AT", "BE", "BO", "BR", "BG", "CA", "CL", "CO", "CR", "CY",
|
||||
"CZ", "DK", "DO", "DE", "EC", "EE", "SV", "FI", "FR", "GR", "GT", "HN",
|
||||
"HK", "HU", "IS", "IE", "IT", "LV", "LT", "LU", "MY", "MT", "MX", "NL",
|
||||
"NZ", "NI", "NO", "PA", "PY", "PE", "PH", "PL", "PT", "SG", "SK", "ES",
|
||||
"SE", "CH", "TW", "TR", "UY", "US", "GB", "AD", "LI", "MC", "ID", "JP",
|
||||
"TH", "VN", "RO", "IL", "ZA", "SA", "AE", "BH", "QA", "OM", "KW", "EG",
|
||||
"MA", "DZ", "TN", "LB", "JO", "PS", "IN", "BY", "KZ", "MD", "UA", "AL",
|
||||
"BA", "HR", "ME", "MK", "RS", "SI", "KR", "BD", "PK", "LK", "GH", "KE",
|
||||
"NG", "TZ", "UG", "AG", "AM", "BS", "BB", "BZ", "BT", "BW", "BF", "CV",
|
||||
"CW", "DM", "FJ", "GM", "GE", "GD", "GW", "GY", "HT", "JM", "KI", "LS",
|
||||
"LR", "MW", "MV", "ML", "MH", "FM", "NA", "NR", "NE", "PW", "PG", "PR",
|
||||
"WS", "SM", "ST", "SN", "SC", "SL", "SB", "KN", "LC", "VC", "SR", "TL",
|
||||
"TO", "TT", "TV", "VU", "AZ", "BN", "BI", "KH", "CM", "TD", "KM", "GQ",
|
||||
"SZ", "GA", "GN", "KG", "LA", "MO", "MR", "MN", "NP", "RW", "TG", "UZ",
|
||||
"ZW", "BJ", "MG", "MU", "MZ", "AO", "CI", "DJ", "ZM", "CD", "CG", "IQ",
|
||||
"LY", "TJ", "VE", "ET", "XK"
|
||||
],
|
||||
"external_urls": {
|
||||
"spotify": "https://open.spotify.com/album/0yhKyyjyKXWUieJ4w1IAEa"
|
||||
},
|
||||
"href": "https://api.spotify.com/v1/albums/0yhKyyjyKXWUieJ4w1IAEa",
|
||||
"id": "0yhKyyjyKXWUieJ4w1IAEa",
|
||||
"images": [
|
||||
{
|
||||
"url": "https://i.scdn.co/image/ab67616d0000b2739a26f5e04909c87cead97c77",
|
||||
"width": 640,
|
||||
"height": 640
|
||||
},
|
||||
{
|
||||
"url": "https://i.scdn.co/image/ab67616d00001e029a26f5e04909c87cead97c77",
|
||||
"width": 300,
|
||||
"height": 300
|
||||
},
|
||||
{
|
||||
"url": "https://i.scdn.co/image/ab67616d000048519a26f5e04909c87cead97c77",
|
||||
"width": 64,
|
||||
"height": 64
|
||||
}
|
||||
],
|
||||
"name": "Akiba Night",
|
||||
"release_date": "2017-12-22",
|
||||
"release_date_precision": "day",
|
||||
"total_tracks": 1,
|
||||
"type": "album",
|
||||
"uri": "spotify:album:0yhKyyjyKXWUieJ4w1IAEa"
|
||||
},
|
||||
"artists": [
|
||||
{
|
||||
"external_urls": {
|
||||
"spotify": "https://open.spotify.com/artist/6m8MRXIVKb6wQaPlBIDMr1"
|
||||
},
|
||||
"href": "https://api.spotify.com/v1/artists/6m8MRXIVKb6wQaPlBIDMr1",
|
||||
"id": "12345",
|
||||
"name": "Foo",
|
||||
"type": "artist",
|
||||
"uri": "spotify:artist:6m8MRXIVKb6wQaPlBIDMr1"
|
||||
},
|
||||
{
|
||||
"external_urls": {
|
||||
"spotify": "https://open.spotify.com/artist/4kkAIoQmNT5xEoNH5BuQLe"
|
||||
},
|
||||
"href": "https://api.spotify.com/v1/artists/4kkAIoQmNT5xEoNH5BuQLe",
|
||||
"id": "67890",
|
||||
"name": "Bar",
|
||||
"type": "artist",
|
||||
"uri": "spotify:artist:4kkAIoQmNT5xEoNH5BuQLe"
|
||||
}
|
||||
],
|
||||
"available_markets": [
|
||||
"AR", "AU", "AT", "BE", "BO", "BR", "BG", "CA", "CL", "CO", "CR", "CY",
|
||||
"CZ", "DK", "DO", "DE", "EC", "EE", "SV", "FI", "FR", "GR", "GT", "HN",
|
||||
"HK", "HU", "IS", "IE", "IT", "LV", "LT", "LU", "MY", "MT", "MX", "NL",
|
||||
"NZ", "NI", "NO", "PA", "PY", "PE", "PH", "PL", "PT", "SG", "SK", "ES",
|
||||
"SE", "CH", "TW", "TR", "UY", "US", "GB", "AD", "LI", "MC", "ID", "JP",
|
||||
"TH", "VN", "RO", "IL", "ZA", "SA", "AE", "BH", "QA", "OM", "KW", "EG",
|
||||
"MA", "DZ", "TN", "LB", "JO", "PS", "IN", "BY", "KZ", "MD", "UA", "AL",
|
||||
"BA", "HR", "ME", "MK", "RS", "SI", "KR", "BD", "PK", "LK", "GH", "KE",
|
||||
"NG", "TZ", "UG", "AG", "AM", "BS", "BB", "BZ", "BT", "BW", "BF", "CV",
|
||||
"CW", "DM", "FJ", "GM", "GE", "GD", "GW", "GY", "HT", "JM", "KI", "LS",
|
||||
"LR", "MW", "MV", "ML", "MH", "FM", "NA", "NR", "NE", "PW", "PG", "PR",
|
||||
"WS", "SM", "ST", "SN", "SC", "SL", "SB", "KN", "LC", "VC", "SR", "TL",
|
||||
"TO", "TT", "TV", "VU", "AZ", "BN", "BI", "KH", "CM", "TD", "KM", "GQ",
|
||||
"SZ", "GA", "GN", "KG", "LA", "MO", "MR", "MN", "NP", "RW", "TG", "UZ",
|
||||
"ZW", "BJ", "MG", "MU", "MZ", "AO", "CI", "DJ", "ZM", "CD", "CG", "IQ",
|
||||
"LY", "TJ", "VE", "ET", "XK"
|
||||
],
|
||||
"disc_number": 1,
|
||||
"duration_ms": 225268,
|
||||
"explicit": false,
|
||||
"external_ids": {
|
||||
"isrc": "GB-SMU-45-66095"
|
||||
},
|
||||
"external_urls": {
|
||||
"spotify": "https://open.spotify.com/track/6sjZfVJworBX6TqyjkxIJ1"
|
||||
},
|
||||
"href": "https://api.spotify.com/v1/tracks/6sjZfVJworBX6TqyjkxIJ1",
|
||||
"id": "6sjZfVJworBX6TqyjkxIJ1",
|
||||
"is_local": false,
|
||||
"name": "Akiba Nights",
|
||||
"popularity": 29,
|
||||
"preview_url": "https://p.scdn.co/mp3-preview/a1c6c0c71f42caff0b19d988849602fefbf7754a?cid=4e414367a1d14c75a5c5129a627fcab8",
|
||||
"track_number": 1,
|
||||
"type": "track",
|
||||
"uri": "spotify:track:6sjZfVJworBX6TqyjkxIJ1"
|
||||
}
|
||||
Loading…
Reference in a new issue