From 46e5f9201da05161490f8c173c789cf1afa45ff5 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Tue, 6 Dec 2022 11:36:05 +0100 Subject: [PATCH] feat: add artist_id field to album item --- src/client/music_playlist.rs | 27 +-- src/client/response/music_item.rs | 4 + ...tist__tests__map_music_artist_default.snap | 107 ++++++++++ ...tist__tests__map_music_artist_no_cont.snap | 20 ++ ...ests__map_music_artist_no_more_albums.snap | 15 ++ ...s__map_music_artist_only_more_singles.snap | 39 ++++ ..._tests__map_music_artist_only_singles.snap | 1 + ...sic_details__tests__map_music_related.snap | 2 + ...__tests__map_music_new_albums_default.snap | 200 ++++++++++++++++++ ...st__tests__map_music_album_one_artist.snap | 1 + ...earch__tests__map_music_search_albums.snap | 20 ++ ..._tests__map_music_search_main_default.snap | 3 + ...h__tests__map_music_search_main_radio.snap | 3 + ...ch__tests__map_music_search_main_typo.snap | 4 + src/model/mod.rs | 2 + .../snapshots/youtube__music_album_basic.snap | 20 ++ .../youtube__music_album_basic_all.snap | 43 ++++ .../youtube__music_album_no_more_albums.snap | 15 ++ .../youtube__music_album_one_artist.snap | 1 + .../youtube__music_album_only_singles.snap | 1 + tests/youtube.rs | 1 + 21 files changed, 516 insertions(+), 13 deletions(-) diff --git a/src/client/music_playlist.rs b/src/client/music_playlist.rs index ecd0f3c..92e5e79 100644 --- a/src/client/music_playlist.rs +++ b/src/client/music_playlist.rs @@ -274,6 +274,19 @@ impl MapResponse for response::MusicPlaylist { "no sectionListRenderer content", )))?; + let mut subtitle_split = header.subtitle.split(util::DOT_SEPARATOR); + let year_txt = subtitle_split.try_swap_remove(2).map(|cmp| cmp.to_string()); + + let artists_p = subtitle_split.try_swap_remove(1); + let (artists, by_va) = map_artists(artists_p); + let album_type_txt = subtitle_split + .try_swap_remove(0) + .map(|part| part.to_string()) + .unwrap_or_default(); + + let album_type = map_album_type(album_type_txt.as_str(), lang); + let year = year_txt.and_then(|txt| util::parse_numeric(&txt).ok()); + let (artist_id, playlist_id) = header .menu .map(|mut menu| { @@ -291,19 +304,7 @@ impl MapResponse for response::MusicPlaylist { ) }) .unwrap_or_default(); - - let mut subtitle_split = header.subtitle.split(util::DOT_SEPARATOR); - let year_txt = subtitle_split.try_swap_remove(2).map(|cmp| cmp.to_string()); - - let artists_p = subtitle_split.try_swap_remove(1); - let (artists, by_va) = map_artists(artists_p); - let album_type_txt = subtitle_split - .try_swap_remove(0) - .map(|part| part.to_string()) - .unwrap_or_default(); - - let album_type = map_album_type(album_type_txt.as_str(), lang); - let year = year_txt.and_then(|txt| util::parse_numeric(&txt).ok()); + let artist_id = artist_id.or_else(|| artists.first().and_then(|a| a.id.to_owned())); let mut mapper = MusicListMapper::with_album( lang, diff --git a/src/client/response/music_item.rs b/src/client/response/music_item.rs index 8bc9330..caffaf3 100644 --- a/src/client/response/music_item.rs +++ b/src/client/response/music_item.rs @@ -675,6 +675,8 @@ impl MusicListMapper { let (artists, by_va) = map_artists(subtitle_p2); + let artist_id = map_artist_id_fallback(item.menu, artists.first()); + let year = subtitle_p3 .and_then(|st| util::parse_numeric(st.first_str()).ok()); @@ -683,6 +685,7 @@ impl MusicListMapper { name: title, cover: item.thumbnail.into(), artists, + artist_id, album_type, year, by_va, @@ -809,6 +812,7 @@ impl MusicListMapper { id, name: item.title, cover: item.thumbnail_renderer.into(), + artist_id: artists.first().and_then(|a| a.id.to_owned()), artists, album_type, year, diff --git a/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_default.snap b/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_default.snap index a2bb30d..d183f9c 100644 --- a/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_default.snap +++ b/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_default.snap @@ -506,6 +506,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2021), by_va: false, @@ -531,6 +532,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2019), by_va: false, @@ -556,6 +558,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2017), by_va: false, @@ -581,6 +584,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2014), by_va: false, @@ -606,6 +610,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2014), by_va: false, @@ -631,6 +636,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2011), by_va: false, @@ -656,6 +662,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2011), by_va: false, @@ -681,6 +688,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2010), by_va: false, @@ -706,6 +714,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2010), by_va: false, @@ -731,6 +740,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2009), by_va: false, @@ -756,6 +766,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2022), by_va: false, @@ -781,6 +792,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2021), by_va: false, @@ -806,6 +818,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2011), by_va: false, @@ -831,6 +844,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2015), by_va: false, @@ -856,6 +870,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2010), by_va: false, @@ -881,6 +896,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -906,6 +922,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -931,6 +948,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -956,6 +974,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -981,6 +1000,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1006,6 +1026,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1031,6 +1052,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1056,6 +1078,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1081,6 +1104,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1106,6 +1130,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1131,6 +1156,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1156,6 +1182,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1181,6 +1208,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1206,6 +1234,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1231,6 +1260,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1256,6 +1286,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1281,6 +1312,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1306,6 +1338,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1331,6 +1364,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1356,6 +1390,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1381,6 +1416,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1406,6 +1442,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1431,6 +1468,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1456,6 +1494,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1481,6 +1520,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1506,6 +1546,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1531,6 +1572,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1556,6 +1598,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1581,6 +1624,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1606,6 +1650,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1631,6 +1676,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1656,6 +1702,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1681,6 +1728,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1706,6 +1754,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1731,6 +1780,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1756,6 +1806,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1781,6 +1832,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1806,6 +1858,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1831,6 +1884,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1856,6 +1910,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1881,6 +1936,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1906,6 +1962,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1931,6 +1988,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1956,6 +2014,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1981,6 +2040,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -2006,6 +2066,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2020), by_va: false, @@ -2031,6 +2092,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2020), by_va: false, @@ -2056,6 +2118,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2081,6 +2144,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2106,6 +2170,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2131,6 +2196,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2156,6 +2222,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2181,6 +2248,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2206,6 +2274,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2231,6 +2300,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2256,6 +2326,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2281,6 +2352,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2306,6 +2378,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2331,6 +2404,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2356,6 +2430,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2381,6 +2456,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2406,6 +2482,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2431,6 +2508,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2456,6 +2534,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2481,6 +2560,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2506,6 +2586,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2531,6 +2612,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2556,6 +2638,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2018), by_va: false, @@ -2581,6 +2664,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2018), by_va: false, @@ -2606,6 +2690,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2018), by_va: false, @@ -2631,6 +2716,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2018), by_va: false, @@ -2656,6 +2742,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2681,6 +2768,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2706,6 +2794,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2731,6 +2820,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2756,6 +2846,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2781,6 +2872,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2806,6 +2898,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2831,6 +2924,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2856,6 +2950,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2881,6 +2976,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2906,6 +3002,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2931,6 +3028,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2956,6 +3054,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2981,6 +3080,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3006,6 +3106,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3031,6 +3132,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3056,6 +3158,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3081,6 +3184,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3106,6 +3210,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3131,6 +3236,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3156,6 +3262,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2011), by_va: false, diff --git a/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_cont.snap b/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_cont.snap index 9393d27..c490136 100644 --- a/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_cont.snap +++ b/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_cont.snap @@ -506,6 +506,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2021), by_va: false, @@ -531,6 +532,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2019), by_va: false, @@ -556,6 +558,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2017), by_va: false, @@ -581,6 +584,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2014), by_va: false, @@ -606,6 +610,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2014), by_va: false, @@ -631,6 +636,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2011), by_va: false, @@ -656,6 +662,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2011), by_va: false, @@ -681,6 +688,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2010), by_va: false, @@ -706,6 +714,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2010), by_va: false, @@ -731,6 +740,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2009), by_va: false, @@ -756,6 +766,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -781,6 +792,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -806,6 +818,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -831,6 +844,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -856,6 +870,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -881,6 +896,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -906,6 +922,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -931,6 +948,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -956,6 +974,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -981,6 +1000,7 @@ MusicArtist( name: "Ed Sheeran", ), ], + artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, diff --git a/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_more_albums.snap b/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_more_albums.snap index c4e2f68..523501b 100644 --- a/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_more_albums.snap +++ b/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_more_albums.snap @@ -409,6 +409,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2019), by_va: false, @@ -434,6 +435,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2016), by_va: false, @@ -459,6 +461,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2015), by_va: false, @@ -484,6 +487,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2014), by_va: false, @@ -509,6 +513,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2020), by_va: false, @@ -534,6 +539,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2020), by_va: false, @@ -559,6 +565,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2019), by_va: false, @@ -584,6 +591,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2017), by_va: false, @@ -609,6 +617,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2017), by_va: false, @@ -634,6 +643,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2016), by_va: false, @@ -659,6 +669,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2016), by_va: false, @@ -684,6 +695,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2014), by_va: false, @@ -709,6 +721,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2014), by_va: false, @@ -734,6 +747,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2007), by_va: false, @@ -759,6 +773,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2006), by_va: false, diff --git a/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_only_more_singles.snap b/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_only_more_singles.snap index 0eaf66a..9364d01 100644 --- a/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_only_more_singles.snap +++ b/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_only_more_singles.snap @@ -510,6 +510,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Album, year: Some(2022), by_va: false, @@ -535,6 +536,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Album, year: Some(2022), by_va: false, @@ -560,6 +562,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Album, year: Some(2018), by_va: false, @@ -585,6 +588,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Album, year: Some(2017), by_va: false, @@ -610,6 +614,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Album, year: Some(2014), by_va: false, @@ -635,6 +640,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Album, year: Some(2011), by_va: false, @@ -660,6 +666,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Ep, year: Some(2010), by_va: false, @@ -685,6 +692,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Ep, year: Some(2009), by_va: false, @@ -710,6 +718,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Ep, year: Some(2017), by_va: false, @@ -735,6 +744,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2022), by_va: false, @@ -760,6 +770,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2022), by_va: false, @@ -785,6 +796,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2022), by_va: false, @@ -810,6 +822,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2022), by_va: false, @@ -835,6 +848,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2021), by_va: false, @@ -860,6 +874,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2021), by_va: false, @@ -885,6 +900,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2021), by_va: false, @@ -910,6 +926,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2021), by_va: false, @@ -935,6 +952,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2021), by_va: false, @@ -960,6 +978,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2021), by_va: false, @@ -985,6 +1004,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2019), by_va: false, @@ -1010,6 +1030,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2018), by_va: false, @@ -1035,6 +1056,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2018), by_va: false, @@ -1060,6 +1082,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2018), by_va: false, @@ -1085,6 +1108,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2017), by_va: false, @@ -1110,6 +1134,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2017), by_va: false, @@ -1135,6 +1160,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2017), by_va: false, @@ -1160,6 +1186,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2017), by_va: false, @@ -1185,6 +1212,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2017), by_va: false, @@ -1210,6 +1238,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2016), by_va: false, @@ -1235,6 +1264,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2016), by_va: false, @@ -1260,6 +1290,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2015), by_va: false, @@ -1285,6 +1316,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2015), by_va: false, @@ -1310,6 +1342,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2015), by_va: false, @@ -1335,6 +1368,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2015), by_va: false, @@ -1360,6 +1394,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2015), by_va: false, @@ -1385,6 +1420,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2014), by_va: false, @@ -1410,6 +1446,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2014), by_va: false, @@ -1435,6 +1472,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2014), by_va: false, @@ -1460,6 +1498,7 @@ MusicArtist( name: "Imagine Dragons", ), ], + artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2013), by_va: false, diff --git a/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_only_singles.snap b/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_only_singles.snap index 518e085..0854547 100644 --- a/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_only_singles.snap +++ b/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_only_singles.snap @@ -432,6 +432,7 @@ MusicArtist( name: "Sulli", ), ], + artist_id: Some("UCfwCE5VhPMGxNPFxtVv7lRw"), album_type: Single, year: Some(2019), by_va: false, diff --git a/src/client/snapshots/rustypipe__client__music_details__tests__map_music_related.snap b/src/client/snapshots/rustypipe__client__music_details__tests__map_music_related.snap index b0c6db6..f153a10 100644 --- a/src/client/snapshots/rustypipe__client__music_details__tests__map_music_related.snap +++ b/src/client/snapshots/rustypipe__client__music_details__tests__map_music_related.snap @@ -741,6 +741,7 @@ MusicRelated( name: "aespa", ), ], + artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), album_type: Album, year: Some(2022), by_va: false, @@ -766,6 +767,7 @@ MusicRelated( name: "aespa", ), ], + artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), album_type: Ep, year: Some(2021), by_va: false, diff --git a/src/client/snapshots/rustypipe__client__music_new__tests__map_music_new_albums_default.snap b/src/client/snapshots/rustypipe__client__music_new__tests__map_music_new_albums_default.snap index 86d0cd7..a545850 100644 --- a/src/client/snapshots/rustypipe__client__music_new__tests__map_music_new_albums_default.snap +++ b/src/client/snapshots/rustypipe__client__music_new__tests__map_music_new_albums_default.snap @@ -24,6 +24,7 @@ expression: map_res.c name: "Dermot Kennedy", ), ], + artist_id: Some("UClHxZy_9ArA6rploIzcDReQ"), album_type: Album, year: None, by_va: false, @@ -49,6 +50,7 @@ expression: map_res.c name: "Capital Bra", ), ], + artist_id: Some("UCa7FGSUsN2wNRUclibmicMg"), album_type: Single, year: None, by_va: false, @@ -74,6 +76,7 @@ expression: map_res.c name: "Sarah Connor", ), ], + artist_id: Some("UCRD-INDaHvHlO8K_33uKetQ"), album_type: Album, year: None, by_va: false, @@ -103,6 +106,7 @@ expression: map_res.c name: "FOURTY", ), ], + artist_id: Some("UCFrNQgyEQz5fRIW90uqP7rw"), album_type: Album, year: None, by_va: false, @@ -128,6 +132,7 @@ expression: map_res.c name: "FLETCHER", ), ], + artist_id: Some("UCzrpaSWxEkjeKfoSR2L7OzQ"), album_type: Album, year: None, by_va: false, @@ -157,6 +162,7 @@ expression: map_res.c name: "Enyadres", ), ], + artist_id: Some("UCXnN-eHLEDBJKjV12WzfYMw"), album_type: Single, year: None, by_va: false, @@ -182,6 +188,7 @@ expression: map_res.c name: "mazie", ), ], + artist_id: Some("UC0_KSKflVDkoLYKg4vNGO1A"), album_type: Single, year: None, by_va: false, @@ -211,6 +218,7 @@ expression: map_res.c name: "Joel Brandenstein", ), ], + artist_id: Some("UCc_iRXEpehN-dDTkPLoBjZg"), album_type: Single, year: None, by_va: false, @@ -236,6 +244,7 @@ expression: map_res.c name: "Gert Steinbäcker", ), ], + artist_id: Some("UCpVPM62RMcDpjmXacKIEosg"), album_type: Album, year: None, by_va: false, @@ -261,6 +270,7 @@ expression: map_res.c name: "Rammstein", ), ], + artist_id: Some("UCs6GGpd9zvsYghuYe0VDFUQ"), album_type: Single, year: None, by_va: false, @@ -286,6 +296,7 @@ expression: map_res.c name: "1986zig", ), ], + artist_id: Some("UCg3M7Pk71xLoQ7rfeGYfzUw"), album_type: Album, year: None, by_va: false, @@ -315,6 +326,7 @@ expression: map_res.c name: "Kim Petras", ), ], + artist_id: Some("UCgpBsaDW2n_6ruzht3wvP0A"), album_type: Single, year: None, by_va: false, @@ -340,6 +352,7 @@ expression: map_res.c name: "Mehdi YZ", ), ], + artist_id: Some("UCjQ_EknxA-PSdgzXvKpCKYg"), album_type: Album, year: None, by_va: false, @@ -365,6 +378,7 @@ expression: map_res.c name: "Helene Fischer", ), ], + artist_id: Some("UCE7_p3lcXA-YXRZp2PjrgYw"), album_type: Ep, year: None, by_va: false, @@ -390,6 +404,7 @@ expression: map_res.c name: "DJ Ötzi", ), ], + artist_id: Some("UCOPDRGEfpw2kmMypQz-iW8Q"), album_type: Album, year: None, by_va: false, @@ -415,6 +430,7 @@ expression: map_res.c name: "Taylor Swift", ), ], + artist_id: Some("UCPC0L1d253x-KuMNwa05TpA"), album_type: Single, year: None, by_va: false, @@ -440,6 +456,7 @@ expression: map_res.c name: "Roman Nagel", ), ], + artist_id: Some("UCAqZTXTRBQMyK73Zlq5n0eQ"), album_type: Single, year: None, by_va: false, @@ -465,6 +482,7 @@ expression: map_res.c name: "Farid Bang", ), ], + artist_id: Some("UC4gi504gkSyoXt9vfaGUr9A"), album_type: Ep, year: None, by_va: false, @@ -490,6 +508,7 @@ expression: map_res.c name: "Matze Knop", ), ], + artist_id: Some("UC90P3pg6Sa2cqHxdXrVPorQ"), album_type: Single, year: None, by_va: false, @@ -515,6 +534,7 @@ expression: map_res.c name: "Nina Chuba", ), ], + artist_id: Some("UCtBk1TIUH15p2pJvKFtPjgA"), album_type: Single, year: None, by_va: false, @@ -540,6 +560,7 @@ expression: map_res.c name: "Rozzi", ), ], + artist_id: Some("UCizMcrm1SSYA-Gascg05S4g"), album_type: Album, year: None, by_va: false, @@ -565,6 +586,7 @@ expression: map_res.c name: "Stereoact", ), ], + artist_id: Some("UCxpEXfdz8GpczOZ8axPLApg"), album_type: Single, year: None, by_va: false, @@ -590,6 +612,7 @@ expression: map_res.c name: "Nickelback", ), ], + artist_id: Some("UC1T4LYUer48KhKlrru13kUg"), album_type: Album, year: None, by_va: false, @@ -615,6 +638,7 @@ expression: map_res.c name: "Montez", ), ], + artist_id: Some("UCccQ2_F-L5EQo6wEdqBkxHA"), album_type: Single, year: None, by_va: false, @@ -640,6 +664,7 @@ expression: map_res.c name: "Alexandra Hamilton-Ayres", ), ], + artist_id: Some("UCE7DD2CgO3MFCsGQyiWYe-w"), album_type: Album, year: None, by_va: false, @@ -673,6 +698,7 @@ expression: map_res.c name: "Joshi Mizu", ), ], + artist_id: Some("UCsPz48w0M3QUEGAiDP1x17w"), album_type: Single, year: None, by_va: false, @@ -698,6 +724,7 @@ expression: map_res.c name: "Kyle Lionhart", ), ], + artist_id: Some("UC_PsyV7331J1aX4368v10pw"), album_type: Album, year: None, by_va: false, @@ -727,6 +754,7 @@ expression: map_res.c name: "Bazzazian", ), ], + artist_id: Some("UC-fLJhhYstbX8ns-mYKsH_Q"), album_type: Single, year: None, by_va: false, @@ -752,6 +780,7 @@ expression: map_res.c name: "Granger Smith", ), ], + artist_id: Some("UCRsN329XrgDGxuYnxXZQiOQ"), album_type: Album, year: None, by_va: false, @@ -781,6 +810,7 @@ expression: map_res.c name: "treamiboii", ), ], + artist_id: Some("UCzFoNWzy9myd8p68utSdqow"), album_type: Single, year: None, by_va: false, @@ -806,6 +836,7 @@ expression: map_res.c name: "Joan Armatrading", ), ], + artist_id: Some("UCD4XPfsYpY2h-5qQiKL8gEw"), album_type: Album, year: None, by_va: false, @@ -831,6 +862,7 @@ expression: map_res.c name: "Alan Walker", ), ], + artist_id: Some("UCaXJEi-wOOVe2eZZHzyz4mQ"), album_type: Single, year: None, by_va: false, @@ -856,6 +888,7 @@ expression: map_res.c name: "Joe Strummer", ), ], + artist_id: Some("UCBzD5ci0CGt_ZhKJw4aZhaQ"), album_type: Album, year: None, by_va: false, @@ -889,6 +922,7 @@ expression: map_res.c name: "Hamza", ), ], + artist_id: Some("UCdbasYA6lUSImvxdqS1RuZQ"), album_type: Single, year: None, by_va: false, @@ -914,6 +948,7 @@ expression: map_res.c name: "Richard Clayderman", ), ], + artist_id: Some("UCCtxJeSaG4jEX-dt3dwx48A"), album_type: Album, year: None, by_va: false, @@ -939,6 +974,7 @@ expression: map_res.c name: "Jennifer Lopez", ), ], + artist_id: Some("UCXDcGa1H1axtr1wkxOR3hZQ"), album_type: Album, year: None, by_va: false, @@ -964,6 +1000,7 @@ expression: map_res.c name: "Saweetie", ), ], + artist_id: Some("UCqTaQGqjAI6fYkr84KZgZEg"), album_type: Ep, year: None, by_va: false, @@ -989,6 +1026,7 @@ expression: map_res.c name: "IMMI", ), ], + artist_id: Some("UCeCsfhcY09c-UvX7DkQDcUw"), album_type: Ep, year: None, by_va: false, @@ -1014,6 +1052,7 @@ expression: map_res.c name: "Disturbed", ), ], + artist_id: Some("UCMHHDXMvnMKRzuEKtMe8ZRA"), album_type: Album, year: None, by_va: false, @@ -1043,6 +1082,7 @@ expression: map_res.c name: "Georgie Riot", ), ], + artist_id: Some("UCoOFEu6s0wk7CUljMh8wisw"), album_type: Single, year: None, by_va: false, @@ -1068,6 +1108,7 @@ expression: map_res.c name: "Lucienne Renaudin Vary", ), ], + artist_id: Some("UCkUheY8pKWamT7BLzQSBzEQ"), album_type: Album, year: None, by_va: false, @@ -1093,6 +1134,7 @@ expression: map_res.c name: "NEFFEX", ), ], + artist_id: Some("UC281fR3Rg1O08xpxArdbdew"), album_type: Single, year: None, by_va: false, @@ -1122,6 +1164,7 @@ expression: map_res.c name: "Crazy Horse", ), ], + artist_id: Some("UC6JhadLTf6g6f-ZdeEaAqBQ"), album_type: Album, year: None, by_va: false, @@ -1147,6 +1190,7 @@ expression: map_res.c name: "Dermot Kennedy", ), ], + artist_id: Some("UClHxZy_9ArA6rploIzcDReQ"), album_type: Single, year: None, by_va: false, @@ -1172,6 +1216,7 @@ expression: map_res.c name: "Fifteen", ), ], + artist_id: Some("UCMlwPZO5rmB_v_ndvZ_fTPQ"), album_type: Ep, year: None, by_va: false, @@ -1205,6 +1250,7 @@ expression: map_res.c name: "Bastidas", ), ], + artist_id: Some("UCQCDX-NwtNYXcRaVRCmIZKw"), album_type: Single, year: None, by_va: false, @@ -1230,6 +1276,7 @@ expression: map_res.c name: "NICO", ), ], + artist_id: Some("UCI1oAsRUrmEG3J4Bj9c6ORw"), album_type: Album, year: None, by_va: false, @@ -1255,6 +1302,7 @@ expression: map_res.c name: "O.G.", ), ], + artist_id: Some("UCDPnXJIiNwEtXqi1qyLbj0w"), album_type: Single, year: None, by_va: false, @@ -1280,6 +1328,7 @@ expression: map_res.c name: "Freddie Long", ), ], + artist_id: Some("UCExSlmVhYeJca_Jjl52zFcw"), album_type: Single, year: None, by_va: false, @@ -1305,6 +1354,7 @@ expression: map_res.c name: "Machine Gun Kelly", ), ], + artist_id: Some("UCDbLC4CaZzi4jt5KyAF0ZQw"), album_type: Single, year: None, by_va: false, @@ -1330,6 +1380,7 @@ expression: map_res.c name: "KeKe", ), ], + artist_id: Some("UC4aep5QQu4CC9sfgovVcffQ"), album_type: Ep, year: None, by_va: false, @@ -1359,6 +1410,7 @@ expression: map_res.c name: "Wildstylez", ), ], + artist_id: Some("UCAeLFBCQS7FvI8PvBrWvSBg"), album_type: Single, year: None, by_va: false, @@ -1384,6 +1436,7 @@ expression: map_res.c name: "Lena&Linus", ), ], + artist_id: Some("UC7qLvzWBYKOiO1Xw3EAgg4w"), album_type: Single, year: None, by_va: false, @@ -1413,6 +1466,7 @@ expression: map_res.c name: "Jay Sean", ), ], + artist_id: Some("UC87-yfmlLTjCf4TnUQ8bWgA"), album_type: Single, year: None, by_va: false, @@ -1438,6 +1492,7 @@ expression: map_res.c name: "Swiss & Die Andern", ), ], + artist_id: Some("UC5uhzuItRbptRuvZdFd15yw"), album_type: Single, year: None, by_va: false, @@ -1463,6 +1518,7 @@ expression: map_res.c name: "HoodBlaq", ), ], + artist_id: Some("UC2FbxmIdK0UIt2V3phUQg5Q"), album_type: Single, year: None, by_va: false, @@ -1488,6 +1544,7 @@ expression: map_res.c name: "Schimmerling", ), ], + artist_id: Some("UCkTzRJf2nUfzwgi6KuIiggg"), album_type: Ep, year: None, by_va: false, @@ -1513,6 +1570,7 @@ expression: map_res.c name: "Red Hot Chili Peppers", ), ], + artist_id: Some("UCrSorX845CEWXzU4Z7BojjA"), album_type: Single, year: None, by_va: false, @@ -1542,6 +1600,7 @@ expression: map_res.c name: "Dardan", ), ], + artist_id: Some("UCiBODJaGfd1aBHE7BF_Iv7w"), album_type: Single, year: None, by_va: false, @@ -1567,6 +1626,7 @@ expression: map_res.c name: "KALIM", ), ], + artist_id: Some("UClIoHK6CtwuMQCEd0n0bOxQ"), album_type: Single, year: None, by_va: false, @@ -1592,6 +1652,7 @@ expression: map_res.c name: "Wolfgang Petry", ), ], + artist_id: Some("UC1JrQ9TyOAcXdcDa2Jx3SCQ"), album_type: Single, year: None, by_va: false, @@ -1617,6 +1678,7 @@ expression: map_res.c name: "Lorenz Büffel", ), ], + artist_id: Some("UCqZPGciX12nh1yiWGfrw8lg"), album_type: Single, year: None, by_va: false, @@ -1642,6 +1704,7 @@ expression: map_res.c name: "Juju", ), ], + artist_id: Some("UCY2f-ZnXFcL6vjtVr0ELzxA"), album_type: Single, year: None, by_va: false, @@ -1675,6 +1738,7 @@ expression: map_res.c name: "Masked Wolf", ), ], + artist_id: Some("UCHUPrayXP0esjzq4Dcvn1NA"), album_type: Single, year: None, by_va: false, @@ -1700,6 +1764,7 @@ expression: map_res.c name: "Yung Hurn", ), ], + artist_id: Some("UCwrvM6h3SUIk2Wo63ySfLNQ"), album_type: Single, year: None, by_va: false, @@ -1725,6 +1790,7 @@ expression: map_res.c name: "Ella Henderson", ), ], + artist_id: Some("UCWN8EUD00PTyo5QQ5ueRr-A"), album_type: Album, year: None, by_va: false, @@ -1750,6 +1816,7 @@ expression: map_res.c name: "Madonna", ), ], + artist_id: Some("UCo4CrqhIV_tSOGdDWfVyCsg"), album_type: Album, year: None, by_va: false, @@ -1775,6 +1842,7 @@ expression: map_res.c name: "KAYEF", ), ], + artist_id: Some("UCp1Rxq0nIVoeljRfJn8yKbg"), album_type: Single, year: None, by_va: false, @@ -1800,6 +1868,7 @@ expression: map_res.c name: "AnnenMayKantereit", ), ], + artist_id: Some("UCK2ZLsY9Mb_dxZiZfKE3lGg"), album_type: Single, year: None, by_va: false, @@ -1829,6 +1898,7 @@ expression: map_res.c name: "Kenan", ), ], + artist_id: None, album_type: Single, year: None, by_va: false, @@ -1858,6 +1928,7 @@ expression: map_res.c name: "Britney Spears", ), ], + artist_id: Some("UCn9i4cdLe14CbsOycTbKMoA"), album_type: Single, year: None, by_va: false, @@ -1883,6 +1954,7 @@ expression: map_res.c name: "Edo Saiya", ), ], + artist_id: Some("UCd-REfvSbRwndM82NWDJ_qg"), album_type: Single, year: None, by_va: false, @@ -1908,6 +1980,7 @@ expression: map_res.c name: "Hans Zimmer", ), ], + artist_id: Some("UCfCNL5oajlQBAlyjWv1ChVw"), album_type: Album, year: None, by_va: false, @@ -1937,6 +2010,7 @@ expression: map_res.c name: "Manele Mentolate", ), ], + artist_id: Some("UCUfYDPYsR_AVR8cvcIB_YDA"), album_type: Single, year: None, by_va: false, @@ -1970,6 +2044,7 @@ expression: map_res.c name: "Aukoustics", ), ], + artist_id: Some("UC3VBeY60GWWpe3w8b4QWDYQ"), album_type: Single, year: None, by_va: false, @@ -1995,6 +2070,7 @@ expression: map_res.c name: "102 Boyz", ), ], + artist_id: Some("UCKGnuwghxYaf_KIXzK7ATIA"), album_type: Single, year: None, by_va: false, @@ -2028,6 +2104,7 @@ expression: map_res.c name: "Myriam Fares", ), ], + artist_id: Some("UCTTcTeAszDGxALRSMkJH9FQ"), album_type: Single, year: None, by_va: false, @@ -2053,6 +2130,7 @@ expression: map_res.c name: "Heinz Rudolf Kunze", ), ], + artist_id: Some("UCobgi-0C_8rBLNuMleLNUKQ"), album_type: Album, year: None, by_va: false, @@ -2078,6 +2156,7 @@ expression: map_res.c name: "The Rolling Stones", ), ], + artist_id: Some("UCNYhhkQqeFLUc-YEDcLpSYQ"), album_type: Ep, year: None, by_va: false, @@ -2103,6 +2182,7 @@ expression: map_res.c name: "Queen", ), ], + artist_id: Some("UCEPMVbUzImPl4p8k4LkGevA"), album_type: Album, year: None, by_va: false, @@ -2128,6 +2208,7 @@ expression: map_res.c name: "01099", ), ], + artist_id: Some("UC4D9yS9Pa7EdpcCHfd8gAiw"), album_type: Single, year: None, by_va: false, @@ -2161,6 +2242,7 @@ expression: map_res.c name: "W&W", ), ], + artist_id: Some("UCjpBcfMn2g8afa3XIZmS3mw"), album_type: Single, year: None, by_va: false, @@ -2186,6 +2268,7 @@ expression: map_res.c name: "Ikke Hüftgold", ), ], + artist_id: Some("UChUTaY5E47rD4njRw7jnYWA"), album_type: Single, year: None, by_va: false, @@ -2215,6 +2298,7 @@ expression: map_res.c name: "Da Mouth of Madness", ), ], + artist_id: Some("UC4vOKBROawrqTT4sSdNNIEQ"), album_type: Single, year: None, by_va: false, @@ -2240,6 +2324,7 @@ expression: map_res.c name: "HIGHTKK", ), ], + artist_id: Some("UCmir5ihSc8-9nRcKJjFLpLQ"), album_type: Single, year: None, by_va: false, @@ -2265,6 +2350,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2290,6 +2376,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2315,6 +2402,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2340,6 +2428,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2365,6 +2454,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2390,6 +2480,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2415,6 +2506,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2440,6 +2532,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2465,6 +2558,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2490,6 +2584,7 @@ expression: map_res.c name: "Salvatore Ganacci", ), ], + artist_id: Some("UCgS5mGElzt2UvcWAZhxd7Jg"), album_type: Album, year: None, by_va: false, @@ -2519,6 +2614,7 @@ expression: map_res.c name: "Matthew Tasa", ), ], + artist_id: Some("UCdwyRvg87lMQlZ7A5HXlAXQ"), album_type: Single, year: None, by_va: false, @@ -2544,6 +2640,7 @@ expression: map_res.c name: "El Alfa", ), ], + artist_id: Some("UCJMzvcg3QxvaTKfpaj57TyA"), album_type: Album, year: None, by_va: false, @@ -2569,6 +2666,7 @@ expression: map_res.c name: "GIMS", ), ], + artist_id: Some("UCanUjmTDohFr8OMpfk5xWBQ"), album_type: Single, year: None, by_va: false, @@ -2594,6 +2692,7 @@ expression: map_res.c name: "Execute", ), ], + artist_id: Some("UCvsCS3G5AHUPBwJrX69VdOw"), album_type: Single, year: None, by_va: false, @@ -2619,6 +2718,7 @@ expression: map_res.c name: "Pietro Lombardi", ), ], + artist_id: Some("UCmM8X1eVACcgB6LxVMqTMeQ"), album_type: Single, year: None, by_va: false, @@ -2644,6 +2744,7 @@ expression: map_res.c name: "Aaron Black", ), ], + artist_id: Some("UCPRysewl9FiinLnzA9SMULw"), album_type: Album, year: None, by_va: false, @@ -2677,6 +2778,7 @@ expression: map_res.c name: "Jay Mason", ), ], + artist_id: Some("UCMXEXLCy9nNjykl0sxlzz0w"), album_type: Single, year: None, by_va: false, @@ -2702,6 +2804,7 @@ expression: map_res.c name: "Majoe", ), ], + artist_id: Some("UCqy_XhL-yur1zdHeKTRDB5g"), album_type: Single, year: None, by_va: false, @@ -2727,6 +2830,7 @@ expression: map_res.c name: "JUJU", ), ], + artist_id: Some("UCJDDeY50cfuDeivwBFZVxLw"), album_type: Ep, year: None, by_va: false, @@ -2752,6 +2856,7 @@ expression: map_res.c name: "James Arthur", ), ], + artist_id: Some("UCNAbUat5xDtp6FeBphe2V_Q"), album_type: Single, year: None, by_va: false, @@ -2781,6 +2886,7 @@ expression: map_res.c name: "Olly Gi", ), ], + artist_id: Some("UCEpSzaxLXatwXlujpF-neQg"), album_type: Single, year: None, by_va: false, @@ -2806,6 +2912,7 @@ expression: map_res.c name: "Zivert", ), ], + artist_id: Some("UCHhV79vwD5W4UZJdJPGE1DQ"), album_type: Single, year: None, by_va: false, @@ -2831,6 +2938,7 @@ expression: map_res.c name: "Alexander Eder", ), ], + artist_id: Some("UClWYTAbTNH9p80shT8yPHqg"), album_type: Single, year: None, by_va: false, @@ -2864,6 +2972,7 @@ expression: map_res.c name: "HARDSTYLE BRAH", ), ], + artist_id: Some("UCdchfYz_9BJz7htrmiCWSOg"), album_type: Single, year: None, by_va: false, @@ -2897,6 +3006,7 @@ expression: map_res.c name: "Stockanotti", ), ], + artist_id: None, album_type: Single, year: None, by_va: false, @@ -2922,6 +3032,7 @@ expression: map_res.c name: "Busta Rhymes", ), ], + artist_id: Some("UCaSeNTljGkpoj1ijhs72nag"), album_type: Ep, year: None, by_va: false, @@ -2951,6 +3062,7 @@ expression: map_res.c name: "ANNA ASTI", ), ], + artist_id: Some("UCUSr-73IZLwrjOozma9Ad_w"), album_type: Single, year: None, by_va: false, @@ -2976,6 +3088,7 @@ expression: map_res.c name: "Lil Jon", ), ], + artist_id: Some("UC-TDzpXxJndgBvyX4dZXVzA"), album_type: Album, year: None, by_va: false, @@ -3001,6 +3114,7 @@ expression: map_res.c name: "Roddy Ricch", ), ], + artist_id: Some("UCC30L98-rMHfY5PJ46duOPg"), album_type: Album, year: None, by_va: false, @@ -3026,6 +3140,7 @@ expression: map_res.c name: "Mark Jack", ), ], + artist_id: Some("UC5rkoI4r3QaSK1gKMxjqmig"), album_type: Album, year: None, by_va: false, @@ -3055,6 +3170,7 @@ expression: map_res.c name: "BTS", ), ], + artist_id: Some("UC-pOuHFcndLpyfWSPVqXt_A"), album_type: Single, year: None, by_va: false, @@ -3088,6 +3204,7 @@ expression: map_res.c name: "Ellie Goulding", ), ], + artist_id: Some("UCyeThGzVYx1MbxUGgIkj3iQ"), album_type: Single, year: None, by_va: false, @@ -3121,6 +3238,7 @@ expression: map_res.c name: "Dastic", ), ], + artist_id: Some("UCUAvCvdLFoPItXgjYy0P7CQ"), album_type: Single, year: None, by_va: false, @@ -3146,6 +3264,7 @@ expression: map_res.c name: "Stormzy", ), ], + artist_id: Some("UCFsLMFP9I8tqxnZZNGKfPow"), album_type: Album, year: None, by_va: false, @@ -3175,6 +3294,7 @@ expression: map_res.c name: "Durdenhauer", ), ], + artist_id: Some("UCsfPXoStha2wqN8hB9dFR2g"), album_type: Single, year: None, by_va: false, @@ -3200,6 +3320,7 @@ expression: map_res.c name: "Teddy Specter", ), ], + artist_id: Some("UCSTEV2xPTlynyEZ3QbbVB5w"), album_type: Album, year: None, by_va: false, @@ -3229,6 +3350,7 @@ expression: map_res.c name: "Lorna Courtney", ), ], + artist_id: Some("UCpXP9-cHlJCMapSYCSZThbw"), album_type: Single, year: None, by_va: false, @@ -3254,6 +3376,7 @@ expression: map_res.c name: "Senidah", ), ], + artist_id: Some("UCmBSyM3ScU07ecv8w8dWvIQ"), album_type: Album, year: None, by_va: false, @@ -3283,6 +3406,7 @@ expression: map_res.c name: "ODMGDIA", ), ], + artist_id: Some("UC8JxlMZ9VPddCuQGwB49fYg"), album_type: Single, year: None, by_va: false, @@ -3308,6 +3432,7 @@ expression: map_res.c name: "Ary", ), ], + artist_id: Some("UC84f7RfWO0kppDO8gbWUPhA"), album_type: Ep, year: None, by_va: false, @@ -3333,6 +3458,7 @@ expression: map_res.c name: "Nisa", ), ], + artist_id: Some("UCTL5jJqSn3tNkk1q3Nrl3gA"), album_type: Single, year: None, by_va: false, @@ -3358,6 +3484,7 @@ expression: map_res.c name: "Eloy de Jong", ), ], + artist_id: Some("UCpvDuL_5kV0teEg2QtbaAWw"), album_type: Ep, year: None, by_va: false, @@ -3383,6 +3510,7 @@ expression: map_res.c name: "Herbert Grönemeyer", ), ], + artist_id: Some("UCpgBROkXWpGzEMXnz0LGHbg"), album_type: Single, year: None, by_va: false, @@ -3408,6 +3536,7 @@ expression: map_res.c name: "Tokio Hotel", ), ], + artist_id: Some("UCsvnoEFghphdrpWIsK6wqDg"), album_type: Album, year: None, by_va: false, @@ -3433,6 +3562,7 @@ expression: map_res.c name: "Unlike Pluto", ), ], + artist_id: Some("UC1LmxpB0f-eVMB7X_9ziTVg"), album_type: Album, year: None, by_va: false, @@ -3458,6 +3588,7 @@ expression: map_res.c name: "Bad Bunny", ), ], + artist_id: Some("UCiY3z8HAGD6BlSNKVn2kSvQ"), album_type: Single, year: None, by_va: false, @@ -3483,6 +3614,7 @@ expression: map_res.c name: "Mike Candys", ), ], + artist_id: Some("UC0Fpo5Sndk_WLcHAMXeJDPQ"), album_type: Single, year: None, by_va: false, @@ -3512,6 +3644,7 @@ expression: map_res.c name: "Tom Grennan", ), ], + artist_id: Some("UCW7eCgFY16p3tWesVwfC1yA"), album_type: Single, year: None, by_va: false, @@ -3541,6 +3674,7 @@ expression: map_res.c name: "BHZ", ), ], + artist_id: Some("UC5RhS3EM_CYfIL0LYWveDrA"), album_type: Single, year: None, by_va: false, @@ -3566,6 +3700,7 @@ expression: map_res.c name: "Nicolae Guta", ), ], + artist_id: Some("UCAkTuOHJleyE4lk-n_taf9A"), album_type: Single, year: None, by_va: false, @@ -3591,6 +3726,7 @@ expression: map_res.c name: "Robbie Williams", ), ], + artist_id: Some("UCmAgTXAlnckJJBFmqYlHnNA"), album_type: Single, year: None, by_va: false, @@ -3616,6 +3752,7 @@ expression: map_res.c name: "Vanessa Mai", ), ], + artist_id: Some("UCFTcSVPYRWlDoHisR-ZKwgw"), album_type: Single, year: None, by_va: false, @@ -3649,6 +3786,7 @@ expression: map_res.c name: "Moonshine", ), ], + artist_id: Some("UCQTiCJddISPD9BwAq4wWrsw"), album_type: Single, year: None, by_va: false, @@ -3674,6 +3812,7 @@ expression: map_res.c name: "Rnbstylerz", ), ], + artist_id: Some("UC-g1V9YrA8Fg13BwcG_W-4g"), album_type: Single, year: None, by_va: false, @@ -3699,6 +3838,7 @@ expression: map_res.c name: "Raportagen", ), ], + artist_id: Some("UCsagRjawwvj9-bybPFt5d-w"), album_type: Single, year: None, by_va: false, @@ -3724,6 +3864,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -3749,6 +3890,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -3774,6 +3916,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -3799,6 +3942,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -3824,6 +3968,7 @@ expression: map_res.c name: "Entspannungsmusik", ), ], + artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -3849,6 +3994,7 @@ expression: map_res.c name: "Hemso", ), ], + artist_id: Some("UCx8wewQwEdHFWPf7TYwAGvA"), album_type: Single, year: None, by_va: false, @@ -3874,6 +4020,7 @@ expression: map_res.c name: "Alle Farben", ), ], + artist_id: Some("UC-ne4DOpdAkBqXhFGRcI7xw"), album_type: Single, year: None, by_va: false, @@ -3903,6 +4050,7 @@ expression: map_res.c name: "HEALTH", ), ], + artist_id: Some("UCdSgOgQ0WtelXBMKF3tDsqg"), album_type: Single, year: None, by_va: false, @@ -3928,6 +4076,7 @@ expression: map_res.c name: "Sefo", ), ], + artist_id: Some("UCQOiZrSMNwNiyLH2fNqNYNw"), album_type: Single, year: None, by_va: false, @@ -3953,6 +4102,7 @@ expression: map_res.c name: "Iron Maiden", ), ], + artist_id: Some("UC0zbzp6x7zR8u0LhanNWFyw"), album_type: Single, year: None, by_va: false, @@ -3978,6 +4128,7 @@ expression: map_res.c name: "Ozuna", ), ], + artist_id: Some("UCKEFjh4JL-OyMI8z3h5Coaw"), album_type: Single, year: None, by_va: false, @@ -4003,6 +4154,7 @@ expression: map_res.c name: "Natalie Jane", ), ], + artist_id: Some("UCcZVM-P7y-p4wUkro4YZHCg"), album_type: Single, year: None, by_va: false, @@ -4028,6 +4180,7 @@ expression: map_res.c name: "Gorillaz", ), ], + artist_id: Some("UCNIV5B_aJnLrKDSnW_MOmcQ"), album_type: Single, year: None, by_va: false, @@ -4053,6 +4206,7 @@ expression: map_res.c name: "1nonly", ), ], + artist_id: Some("UC4XHSTHLOwFvFiZj4gFqMsA"), album_type: Ep, year: None, by_va: false, @@ -4082,6 +4236,7 @@ expression: map_res.c name: "Ramaj Eroc", ), ], + artist_id: Some("UCKh0FImZMYvIZHzMSlbschg"), album_type: Single, year: None, by_va: false, @@ -4107,6 +4262,7 @@ expression: map_res.c name: "Don Goliath", ), ], + artist_id: Some("UCrSq-XRASp4clbiECIzD09g"), album_type: Album, year: None, by_va: false, @@ -4140,6 +4296,7 @@ expression: map_res.c name: "Trap-A-Holics", ), ], + artist_id: Some("UCGwa7ZUGHL9pisTwM1rUIRQ"), album_type: Album, year: None, by_va: false, @@ -4165,6 +4322,7 @@ expression: map_res.c name: "Don Omar", ), ], + artist_id: Some("UCTrIOPtBeAN2E0R-sgU9JxA"), album_type: Single, year: None, by_va: false, @@ -4190,6 +4348,7 @@ expression: map_res.c name: "Zarka Voya", ), ], + artist_id: Some("UCc6C8g9N1gfQfB1ebDG_3ww"), album_type: Album, year: None, by_va: false, @@ -4219,6 +4378,7 @@ expression: map_res.c name: "Nikster", ), ], + artist_id: None, album_type: Single, year: None, by_va: false, @@ -4244,6 +4404,7 @@ expression: map_res.c name: "Jose Stan", ), ], + artist_id: Some("UCAz_-i_z6Rf66dYop52ElSA"), album_type: Album, year: None, by_va: false, @@ -4273,6 +4434,7 @@ expression: map_res.c name: "kizary", ), ], + artist_id: Some("UCK0E138ftvcNWus81A4zQ2A"), album_type: Single, year: None, by_va: false, @@ -4298,6 +4460,7 @@ expression: map_res.c name: "Simon Decker", ), ], + artist_id: Some("UCeXYHFfN53Bw_4dbPLlJgrA"), album_type: Album, year: None, by_va: false, @@ -4323,6 +4486,7 @@ expression: map_res.c name: "Gentleman", ), ], + artist_id: Some("UCywFOWItbhJH6oZadxC2VkQ"), album_type: Single, year: None, by_va: false, @@ -4352,6 +4516,7 @@ expression: map_res.c name: "Jack Center", ), ], + artist_id: Some("UC74paQc9elYMxQKL8gpT1ow"), album_type: Single, year: None, by_va: false, @@ -4381,6 +4546,7 @@ expression: map_res.c name: "GARP", ), ], + artist_id: None, album_type: Single, year: None, by_va: false, @@ -4406,6 +4572,7 @@ expression: map_res.c name: "sanah", ), ], + artist_id: Some("UCV8SUfLumnpfd-Wa_i7B2Zw"), album_type: Album, year: None, by_va: false, @@ -4431,6 +4598,7 @@ expression: map_res.c name: "Our Last Night", ), ], + artist_id: Some("UCYW1nL0TZhQVLbS6KATqtig"), album_type: Album, year: None, by_va: false, @@ -4460,6 +4628,7 @@ expression: map_res.c name: "Pamela Jain", ), ], + artist_id: Some("UC13ToEQgfmTe8_GW19LYtCg"), album_type: Album, year: None, by_va: false, @@ -4485,6 +4654,7 @@ expression: map_res.c name: "BIBI", ), ], + artist_id: Some("UCWJKJhxr3a6P_z34eb7rmFw"), album_type: Album, year: None, by_va: false, @@ -4510,6 +4680,7 @@ expression: map_res.c name: "LUVRE47", ), ], + artist_id: Some("UCfjHG2KXoUrByv8MCSf6-LA"), album_type: Album, year: None, by_va: false, @@ -4535,6 +4706,7 @@ expression: map_res.c name: "Roberto Kabina", ), ], + artist_id: Some("UCy0W7pwUVNzrLVmIEKTkNSQ"), album_type: Album, year: None, by_va: false, @@ -4560,6 +4732,7 @@ expression: map_res.c name: "Dolly Parton", ), ], + artist_id: Some("UCXJscayh5BT8m2ZVFQSdeVw"), album_type: Album, year: None, by_va: false, @@ -4589,6 +4762,7 @@ expression: map_res.c name: "Johann Strauss Orchestra", ), ], + artist_id: Some("UCwEeCuFQo7gH6dcMeNnLg1A"), album_type: Album, year: None, by_va: false, @@ -4614,6 +4788,7 @@ expression: map_res.c name: "Nessa Barrett", ), ], + artist_id: Some("UCn81HiOrP7OO3SkdGvR6HPA"), album_type: Album, year: None, by_va: false, @@ -4639,6 +4814,7 @@ expression: map_res.c name: "Mr. Schnubs", ), ], + artist_id: Some("UCnL5ZocATjKZZ3IH_DXODkw"), album_type: Album, year: None, by_va: false, @@ -4664,6 +4840,7 @@ expression: map_res.c name: "Nej\'", ), ], + artist_id: Some("UCzB2BJ-eZel88EH4IUZATrA"), album_type: Album, year: None, by_va: false, @@ -4689,6 +4866,7 @@ expression: map_res.c name: "Annett Louisan", ), ], + artist_id: Some("UCFwFmMRTIVhsUtdudux_p4w"), album_type: Album, year: None, by_va: false, @@ -4714,6 +4892,7 @@ expression: map_res.c name: "Ella Fitzgerald", ), ], + artist_id: Some("UCuMHq8jMRZXpUxSGLBuCa9g"), album_type: Album, year: None, by_va: false, @@ -4739,6 +4918,7 @@ expression: map_res.c name: "Umut Capone", ), ], + artist_id: Some("UCNWORQud7YePhTxexu1qRFg"), album_type: Album, year: None, by_va: false, @@ -4764,6 +4944,7 @@ expression: map_res.c name: "AViVA", ), ], + artist_id: Some("UCighp0MtP4WdjnNJQtrTiJQ"), album_type: Album, year: None, by_va: false, @@ -4789,6 +4970,7 @@ expression: map_res.c name: "Iggy Pop", ), ], + artist_id: Some("UCN2OwEXNYJFzgHvR7912Btg"), album_type: Album, year: None, by_va: false, @@ -4814,6 +4996,7 @@ expression: map_res.c name: "kizaru", ), ], + artist_id: Some("UCLUW0Kr_w2nG0mv8q_qamxQ"), album_type: Album, year: None, by_va: false, @@ -4839,6 +5022,7 @@ expression: map_res.c name: "Marc Pircher", ), ], + artist_id: Some("UCfTUgzPRMoYWYjrwS5BgWfA"), album_type: Album, year: None, by_va: false, @@ -4864,6 +5048,7 @@ expression: map_res.c name: "King Khalil", ), ], + artist_id: Some("UCv83kiz_XGb4rfO0CXxzn5A"), album_type: Album, year: None, by_va: false, @@ -4889,6 +5074,7 @@ expression: map_res.c name: "Adam Kucho", ), ], + artist_id: Some("UCGknzG6-_Eh_jm_GcNkkYrQ"), album_type: Album, year: None, by_va: false, @@ -4914,6 +5100,7 @@ expression: map_res.c name: "SCH", ), ], + artist_id: Some("UCGyvS9Y1RU6CeTW78bltfjA"), album_type: Album, year: None, by_va: false, @@ -4951,6 +5138,7 @@ expression: map_res.c name: "Bharadwaj", ), ], + artist_id: Some("UCtJe0RYzgPddQXKtWduxz_w"), album_type: Album, year: None, by_va: false, @@ -4976,6 +5164,7 @@ expression: map_res.c name: "Полина Гагарина", ), ], + artist_id: Some("UCXNUMUQfREjoyzhxcXqpvGg"), album_type: Album, year: None, by_va: false, @@ -5001,6 +5190,7 @@ expression: map_res.c name: "Би-2", ), ], + artist_id: Some("UCAbByxN5lRm8SIkq3YYVuYQ"), album_type: Album, year: None, by_va: false, @@ -5026,6 +5216,7 @@ expression: map_res.c name: "YOASOBI", ), ], + artist_id: Some("UCI6B8NkZKqlFWoiC_xE-hzA"), album_type: Album, year: None, by_va: false, @@ -5051,6 +5242,7 @@ expression: map_res.c name: "Niska", ), ], + artist_id: Some("UC2ISePqOr39OQ90kNN1WLjA"), album_type: Album, year: None, by_va: false, @@ -5080,6 +5272,7 @@ expression: map_res.c name: "Alka Yagnik", ), ], + artist_id: Some("UCQd9dydn5gaib_uuVVkYZTQ"), album_type: Album, year: None, by_va: false, @@ -5105,6 +5298,7 @@ expression: map_res.c name: "Vinnie Paz", ), ], + artist_id: Some("UCbZKeXFPMh2lTPwOUDiHAAg"), album_type: Album, year: None, by_va: false, @@ -5130,6 +5324,7 @@ expression: map_res.c name: "The Real McKenzies", ), ], + artist_id: Some("UCZ_J_0XGC5hkOt7W3eEMVUQ"), album_type: Album, year: None, by_va: false, @@ -5155,6 +5350,7 @@ expression: map_res.c name: "Jean-Michel Jarre", ), ], + artist_id: Some("UCgZdvpUfbbUiqJ6UvAdM7EQ"), album_type: Album, year: None, by_va: false, @@ -5180,6 +5376,7 @@ expression: map_res.c name: "Merlin Ferez", ), ], + artist_id: Some("UCBhSdacVokJLmtqxH-TrIig"), album_type: Album, year: None, by_va: false, @@ -5205,6 +5402,7 @@ expression: map_res.c name: "Crvena Jabuka", ), ], + artist_id: Some("UCsNH8wD_AZXHnOlLKsV6KsQ"), album_type: Album, year: None, by_va: false, @@ -5230,6 +5428,7 @@ expression: map_res.c name: "Patti Canyoudothisin", ), ], + artist_id: Some("UCXbHzF6K7-9KnfT69_tdMSw"), album_type: Album, year: None, by_va: false, @@ -5255,6 +5454,7 @@ expression: map_res.c name: "The Smashing Pumpkins", ), ], + artist_id: Some("UCZM3bF24BS-qDMe0OigpeZw"), album_type: Album, year: None, by_va: false, diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_one_artist.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_one_artist.snap index 738a96e..9ac04b0 100644 --- a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_one_artist.snap +++ b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_one_artist.snap @@ -423,6 +423,7 @@ MusicAlbum( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: None, by_va: false, diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_albums.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_albums.snap index 3a76cac..8478df1 100644 --- a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_albums.snap +++ b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_albums.snap @@ -37,6 +37,7 @@ MusicSearchFiltered( name: "aespa", ), ], + artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), album_type: Single, year: Some(2020), by_va: false, @@ -72,6 +73,7 @@ MusicSearchFiltered( name: "aespa", ), ], + artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), album_type: Album, year: Some(2022), by_va: false, @@ -107,6 +109,7 @@ MusicSearchFiltered( name: "Cojack", ), ], + artist_id: Some("UCZK5n7V2-iPHfUXLV2tDvzw"), album_type: Single, year: Some(2020), by_va: false, @@ -142,6 +145,7 @@ MusicSearchFiltered( name: "Montana Of 300", ), ], + artist_id: Some("UCudOYmRtW3uylYtqY1aAD0A"), album_type: Single, year: Some(2020), by_va: false, @@ -177,6 +181,7 @@ MusicSearchFiltered( name: "Alpha Wolf", ), ], + artist_id: Some("UC8whsREta_7Fu-EjRq2Ys-A"), album_type: Single, year: Some(2018), by_va: false, @@ -212,6 +217,7 @@ MusicSearchFiltered( name: "ESKIIMO", ), ], + artist_id: Some("UCRy7ecValgvorRe_8dum9lA"), album_type: Ep, year: Some(2022), by_va: false, @@ -247,6 +253,7 @@ MusicSearchFiltered( name: "Black Mamba Man", ), ], + artist_id: Some("UCdkNrc_l73BHYKRhDqxBo9w"), album_type: Album, year: Some(2017), by_va: false, @@ -282,6 +289,7 @@ MusicSearchFiltered( name: "Paride Saraceni", ), ], + artist_id: Some("UCn09cNujyKjEA1NxD5Aj_mQ"), album_type: Single, year: Some(2019), by_va: false, @@ -317,6 +325,7 @@ MusicSearchFiltered( name: "Addis Black Mamba", ), ], + artist_id: Some("UCYAFIwL4uBWQHBrBiohx1vw"), album_type: Single, year: Some(2019), by_va: false, @@ -360,6 +369,7 @@ MusicSearchFiltered( name: "24.Gz", ), ], + artist_id: Some("UCs04jfHH78YUziFA52P97LA"), album_type: Single, year: Some(2022), by_va: false, @@ -395,6 +405,7 @@ MusicSearchFiltered( name: "Seoul Philharmonic Orchestra", ), ], + artist_id: Some("UCZwE-b-kzA4pQaCQXwOQnlg"), album_type: Single, year: Some(2022), by_va: false, @@ -430,6 +441,7 @@ MusicSearchFiltered( name: "Hever Jara", ), ], + artist_id: Some("UC_SI7sOel-qMTvSe-lGHX8w"), album_type: Single, year: Some(2018), by_va: false, @@ -465,6 +477,7 @@ MusicSearchFiltered( name: "Yung FN", ), ], + artist_id: Some("UCMZowOoC3u_ntr9o52ekeZw"), album_type: Single, year: Some(2022), by_va: false, @@ -500,6 +513,7 @@ MusicSearchFiltered( name: "Hobino", ), ], + artist_id: Some("UCX6v_euBwliDYV2NMTouuSA"), album_type: Single, year: Some(2022), by_va: false, @@ -535,6 +549,7 @@ MusicSearchFiltered( name: "Tee See Connection", ), ], + artist_id: Some("UCAlOD5s3Ro27M61-2Z_UB7w"), album_type: Single, year: Some(2013), by_va: false, @@ -570,6 +585,7 @@ MusicSearchFiltered( name: "Franco Vitola", ), ], + artist_id: Some("UC77rFNJxH8Y2VwSYp8ZTXHA"), album_type: Single, year: Some(2020), by_va: false, @@ -605,6 +621,7 @@ MusicSearchFiltered( name: "Black Mamba", ), ], + artist_id: Some("UCxX9tNcQgCBuU56ezupriqg"), album_type: Album, year: Some(2011), by_va: false, @@ -640,6 +657,7 @@ MusicSearchFiltered( name: "WookTheCrook", ), ], + artist_id: Some("UC6Y8G45J9Uv2EsLLOatymOw"), album_type: Single, year: Some(2022), by_va: false, @@ -675,6 +693,7 @@ MusicSearchFiltered( name: "The Black Mamba", ), ], + artist_id: Some("UCaDT20-B3U8h-tPg_VMvntw"), album_type: Album, year: Some(2012), by_va: false, @@ -710,6 +729,7 @@ MusicSearchFiltered( name: "Voltage", ), ], + artist_id: Some("UCJq1MEuNM0SidXn5pMqqHBA"), album_type: Single, year: Some(2019), by_va: false, diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_default.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_default.snap index 3497bee..984a538 100644 --- a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_default.snap +++ b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_default.snap @@ -226,6 +226,7 @@ MusicSearchResult( name: "aespa", ), ], + artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), album_type: Single, year: Some(2020), by_va: false, @@ -261,6 +262,7 @@ MusicSearchResult( name: "aespa", ), ], + artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), album_type: Album, year: Some(2022), by_va: false, @@ -296,6 +298,7 @@ MusicSearchResult( name: "Cojack", ), ], + artist_id: Some("UCZK5n7V2-iPHfUXLV2tDvzw"), album_type: Single, year: Some(2020), by_va: false, diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_radio.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_radio.snap index 1179b97..9c0f4ac 100644 --- a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_radio.snap +++ b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_radio.snap @@ -194,6 +194,7 @@ MusicSearchResult( ), ], artists: [], + artist_id: None, album_type: Album, year: Some(2016), by_va: true, @@ -224,6 +225,7 @@ MusicSearchResult( ), ], artists: [], + artist_id: None, album_type: Album, year: Some(2022), by_va: true, @@ -259,6 +261,7 @@ MusicSearchResult( name: "Strange Radio", ), ], + artist_id: Some("UCG7LUZBrK6GcfTwowTeTiOQ"), album_type: Album, year: Some(2002), by_va: false, diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_typo.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_typo.snap index 5d39ef8..4170f18 100644 --- a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_typo.snap +++ b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_typo.snap @@ -199,6 +199,7 @@ MusicSearchResult( name: "Namika", ), ], + artist_id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), album_type: Single, year: Some(2015), by_va: false, @@ -234,6 +235,7 @@ MusicSearchResult( name: "Namika", ), ], + artist_id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), album_type: Ep, year: Some(2015), by_va: false, @@ -269,6 +271,7 @@ MusicSearchResult( name: "Boris Brejcha", ), ], + artist_id: Some("UCCpID8TTjkkjLCwBybAfHSg"), album_type: Single, year: Some(2019), by_va: false, @@ -304,6 +307,7 @@ MusicSearchResult( name: "Boris Brejcha", ), ], + artist_id: Some("UCCpID8TTjkkjLCwBybAfHSg"), album_type: Single, year: Some(2019), by_va: false, diff --git a/src/model/mod.rs b/src/model/mod.rs index b1454ff..3d6c80f 100644 --- a/src/model/mod.rs +++ b/src/model/mod.rs @@ -1039,6 +1039,8 @@ pub struct AlbumItem { pub cover: Vec, /// Artists of the album pub artists: Vec, + /// Primary artist ID + pub artist_id: Option, /// Album type (Album/Single/EP) pub album_type: AlbumType, /// Release year of the album diff --git a/tests/snapshots/youtube__music_album_basic.snap b/tests/snapshots/youtube__music_album_basic.snap index 03e18aa..c4e32f7 100644 --- a/tests/snapshots/youtube__music_album_basic.snap +++ b/tests/snapshots/youtube__music_album_basic.snap @@ -21,6 +21,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2010), by_va: false, @@ -35,6 +36,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2014), by_va: false, @@ -49,6 +51,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2008), by_va: false, @@ -63,6 +66,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2012), by_va: false, @@ -77,6 +81,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2021), by_va: false, @@ -91,6 +96,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2018), by_va: false, @@ -105,6 +111,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2014), by_va: false, @@ -119,6 +126,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2006), by_va: false, @@ -133,6 +141,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2016), by_va: false, @@ -147,6 +156,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2017), by_va: false, @@ -161,6 +171,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2017), by_va: false, @@ -175,6 +186,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2008), by_va: false, @@ -189,6 +201,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2021), by_va: false, @@ -203,6 +216,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2006), by_va: false, @@ -217,6 +231,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2015), by_va: false, @@ -231,6 +246,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2015), by_va: false, @@ -245,6 +261,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2014), by_va: false, @@ -259,6 +276,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2010), by_va: false, @@ -273,6 +291,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2014), by_va: false, @@ -287,6 +306,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2008), by_va: false, diff --git a/tests/snapshots/youtube__music_album_basic_all.snap b/tests/snapshots/youtube__music_album_basic_all.snap index 939edde..d8a72ed 100644 --- a/tests/snapshots/youtube__music_album_basic_all.snap +++ b/tests/snapshots/youtube__music_album_basic_all.snap @@ -21,6 +21,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2010), by_va: false, @@ -35,6 +36,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2014), by_va: false, @@ -49,6 +51,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2008), by_va: false, @@ -63,6 +66,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2012), by_va: false, @@ -77,6 +81,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2012), by_va: false, @@ -91,6 +96,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2015), by_va: false, @@ -105,6 +111,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2015), by_va: false, @@ -119,6 +126,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2012), by_va: false, @@ -133,6 +141,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2004), by_va: false, @@ -147,6 +156,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2021), by_va: false, @@ -161,6 +171,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2018), by_va: false, @@ -175,6 +186,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2003), by_va: false, @@ -189,6 +201,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2012), by_va: false, @@ -203,6 +216,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2014), by_va: false, @@ -217,6 +231,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2006), by_va: false, @@ -231,6 +246,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2000), by_va: false, @@ -245,6 +261,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2016), by_va: false, @@ -259,6 +276,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2017), by_va: false, @@ -273,6 +291,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2012), by_va: false, @@ -287,6 +306,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2017), by_va: false, @@ -301,6 +321,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2008), by_va: false, @@ -315,6 +336,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2021), by_va: false, @@ -329,6 +351,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2021), by_va: false, @@ -343,6 +366,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2003), by_va: false, @@ -357,6 +381,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2010), by_va: false, @@ -371,6 +396,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2006), by_va: false, @@ -385,6 +411,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2010), by_va: false, @@ -399,6 +426,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2015), by_va: false, @@ -413,6 +441,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2002), by_va: false, @@ -427,6 +456,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2015), by_va: false, @@ -441,6 +471,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2004), by_va: false, @@ -455,6 +486,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2014), by_va: false, @@ -469,6 +501,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2003), by_va: false, @@ -483,6 +516,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2007), by_va: false, @@ -497,6 +531,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2010), by_va: false, @@ -511,6 +546,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2012), by_va: false, @@ -525,6 +561,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2014), by_va: false, @@ -539,6 +576,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2010), by_va: false, @@ -553,6 +591,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2008), by_va: false, @@ -567,6 +606,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2010), by_va: false, @@ -581,6 +621,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2008), by_va: false, @@ -595,6 +636,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2010), by_va: false, @@ -609,6 +651,7 @@ MusicArtist( name: "Unheilig", ), ], + artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2017), by_va: false, diff --git a/tests/snapshots/youtube__music_album_no_more_albums.snap b/tests/snapshots/youtube__music_album_no_more_albums.snap index eb24800..b872403 100644 --- a/tests/snapshots/youtube__music_album_no_more_albums.snap +++ b/tests/snapshots/youtube__music_album_no_more_albums.snap @@ -21,6 +21,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2016), by_va: false, @@ -35,6 +36,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2014), by_va: false, @@ -49,6 +51,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2014), by_va: false, @@ -63,6 +66,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2007), by_va: false, @@ -77,6 +81,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2020), by_va: false, @@ -91,6 +96,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2017), by_va: false, @@ -105,6 +111,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2017), by_va: false, @@ -119,6 +126,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2020), by_va: false, @@ -133,6 +141,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2016), by_va: false, @@ -147,6 +156,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2015), by_va: false, @@ -161,6 +171,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2019), by_va: false, @@ -175,6 +186,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2006), by_va: false, @@ -189,6 +201,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2016), by_va: false, @@ -203,6 +216,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2019), by_va: false, @@ -217,6 +231,7 @@ MusicArtist( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2014), by_va: false, diff --git a/tests/snapshots/youtube__music_album_one_artist.snap b/tests/snapshots/youtube__music_album_one_artist.snap index 8f8b4b9..0346d4a 100644 --- a/tests/snapshots/youtube__music_album_one_artist.snap +++ b/tests/snapshots/youtube__music_album_one_artist.snap @@ -402,6 +402,7 @@ MusicAlbum( name: "Oonagh", ), ], + artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: None, by_va: false, diff --git a/tests/snapshots/youtube__music_album_only_singles.snap b/tests/snapshots/youtube__music_album_only_singles.snap index 16f0814..4e56735 100644 --- a/tests/snapshots/youtube__music_album_only_singles.snap +++ b/tests/snapshots/youtube__music_album_only_singles.snap @@ -21,6 +21,7 @@ MusicArtist( name: "Sulli", ), ], + artist_id: Some("UCfwCE5VhPMGxNPFxtVv7lRw"), album_type: Single, year: Some(2019), by_va: false, diff --git a/tests/youtube.rs b/tests/youtube.rs index 6cef49f..202cc07 100644 --- a/tests/youtube.rs +++ b/tests/youtube.rs @@ -1662,6 +1662,7 @@ async fn music_search_albums( assert_eq!(album_artist.id.as_ref().unwrap(), artist_id); assert_eq!(album_artist.name, artist); + assert_eq!(album.artist_id.as_ref().unwrap(), artist_id); assert!(!album.cover.is_empty(), "got no cover"); assert_eq!(album.year.as_ref().unwrap(), &year); assert_eq!(album.album_type, album_type);