diff --git a/src/client/music_playlist.rs b/src/client/music_playlist.rs index 92e5e79..4a47707 100644 --- a/src/client/music_playlist.rs +++ b/src/client/music_playlist.rs @@ -10,7 +10,7 @@ use crate::{ use super::{ response::{ self, - music_item::{map_album_type, map_artist_id, map_artists, MusicListMapper}, + music_item::{map_album_type, map_artists, MusicListMapper}, }, ClientType, MapResponse, QBrowse, RustyPipeQuery, }; @@ -274,6 +274,18 @@ impl MapResponse for response::MusicPlaylist { "no sectionListRenderer content", )))?; + let playlist_id = header.menu.and_then(|mut menu| { + menu.menu_renderer + .top_level_buttons + .try_swap_remove(0) + .map(|btn| { + btn.button_renderer + .navigation_endpoint + .watch_playlist_endpoint + .playlist_id + }) + }); + let mut subtitle_split = header.subtitle.split(util::DOT_SEPARATOR); let year_txt = subtitle_split.try_swap_remove(2).map(|cmp| cmp.to_string()); @@ -287,25 +299,6 @@ impl MapResponse for response::MusicPlaylist { 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| { - ( - map_artist_id(menu.menu_renderer.items), - menu.menu_renderer - .top_level_buttons - .try_swap_remove(0) - .map(|btn| { - btn.button_renderer - .navigation_endpoint - .watch_playlist_endpoint - .playlist_id - }), - ) - }) - .unwrap_or_default(); - let artist_id = artist_id.or_else(|| artists.first().and_then(|a| a.id.to_owned())); - let mut mapper = MusicListMapper::with_album( lang, artists.clone(), @@ -333,7 +326,6 @@ impl MapResponse for response::MusicPlaylist { name: header.title, cover: header.thumbnail.into(), artists, - artist_id, description: header.description, album_type, year, diff --git a/src/client/response/music_item.rs b/src/client/response/music_item.rs index caffaf3..3ff520e 100644 --- a/src/client/response/music_item.rs +++ b/src/client/response/music_item.rs @@ -620,7 +620,7 @@ impl MusicListMapper { } // Extract artist id from dropdown menu - let artist_id = map_artist_id_fallback(item.menu, artists.first()); + let artist_id = map_artist_id(item.menu, artists.first()); let track_nr = item.index.and_then(|txt| util::parse_numeric(&txt).ok()); @@ -675,8 +675,6 @@ 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()); @@ -685,7 +683,6 @@ impl MusicListMapper { name: title, cover: item.thumbnail.into(), artists, - artist_id, album_type, year, by_va, @@ -812,7 +809,6 @@ 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, @@ -950,31 +946,29 @@ pub(crate) fn map_artists(artists_p: Option) -> (Vec, (artists, by_va) } -fn map_artist_id_fallback( +pub(crate) fn map_artist_id( menu: Option, fallback_artist: Option<&ArtistId>, ) -> Option { - menu.and_then(|m| map_artist_id(m.menu_renderer.items)) - .or_else(|| fallback_artist.and_then(|a| a.id.to_owned())) -} - -pub(crate) fn map_artist_id(entries: Vec) -> Option { - entries.into_iter().find_map(|i| { - let ep = i - .menu_navigation_item_renderer - .navigation_endpoint - .browse_endpoint; - ep.and_then(|ep| { - ep.browse_endpoint_context_supported_configs - .and_then(|cfg| { - if cfg.browse_endpoint_context_music_config.page_type == PageType::Artist { - Some(ep.browse_id) - } else { - None - } - }) + menu.and_then(|m| { + m.menu_renderer.items.into_iter().find_map(|i| { + let ep = i + .menu_navigation_item_renderer + .navigation_endpoint + .browse_endpoint; + ep.and_then(|ep| { + ep.browse_endpoint_context_supported_configs + .and_then(|cfg| { + if cfg.browse_endpoint_context_music_config.page_type == PageType::Artist { + Some(ep.browse_id) + } else { + None + } + }) + }) }) }) + .or_else(|| fallback_artist.and_then(|a| a.id.to_owned())) } pub(crate) fn map_album_type(txt: &str, lang: Language) -> AlbumType { @@ -997,7 +991,7 @@ pub(crate) fn map_queue_item(item: QueueMusicItem, lang: Language) -> TrackItem let artist_p = subtitle_parts.next(); let (artists, _) = map_artists(artist_p); - let artist_id = map_artist_id_fallback(item.menu, artists.first()); + let artist_id = map_artist_id(item.menu, artists.first()); let subtitle_p2 = subtitle_parts.next(); let (album, view_count) = if is_video { diff --git a/src/client/response/music_playlist.rs b/src/client/response/music_playlist.rs index ac58065..aa2847f 100644 --- a/src/client/response/music_playlist.rs +++ b/src/client/response/music_playlist.rs @@ -5,8 +5,7 @@ use crate::serializer::text::{Text, TextComponents}; use super::{ music_item::{ - ItemSection, MusicContentsRenderer, MusicItemMenuEntry, MusicThumbnailRenderer, - SingleColumnBrowseResult, + ItemSection, MusicContentsRenderer, MusicThumbnailRenderer, SingleColumnBrowseResult, }, Tab, }; @@ -79,8 +78,6 @@ pub(crate) struct HeaderMenuRenderer { #[serde(default)] #[serde_as(as = "VecSkipError<_>")] pub top_level_buttons: Vec, - #[serde_as(as = "VecSkipError<_>")] - pub items: Vec, } #[derive(Debug, Deserialize)] 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 d183f9c..a2bb30d 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,7 +506,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2021), by_va: false, @@ -532,7 +531,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2019), by_va: false, @@ -558,7 +556,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2017), by_va: false, @@ -584,7 +581,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2014), by_va: false, @@ -610,7 +606,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2014), by_va: false, @@ -636,7 +631,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2011), by_va: false, @@ -662,7 +656,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2011), by_va: false, @@ -688,7 +681,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2010), by_va: false, @@ -714,7 +706,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2010), by_va: false, @@ -740,7 +731,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2009), by_va: false, @@ -766,7 +756,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2022), by_va: false, @@ -792,7 +781,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2021), by_va: false, @@ -818,7 +806,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2011), by_va: false, @@ -844,7 +831,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2015), by_va: false, @@ -870,7 +856,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2010), by_va: false, @@ -896,7 +881,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -922,7 +906,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -948,7 +931,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -974,7 +956,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1000,7 +981,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1026,7 +1006,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1052,7 +1031,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1078,7 +1056,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1104,7 +1081,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1130,7 +1106,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1156,7 +1131,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1182,7 +1156,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1208,7 +1181,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1234,7 +1206,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1260,7 +1231,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1286,7 +1256,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1312,7 +1281,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1338,7 +1306,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1364,7 +1331,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1390,7 +1356,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1416,7 +1381,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1442,7 +1406,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1468,7 +1431,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1494,7 +1456,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1520,7 +1481,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1546,7 +1506,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1572,7 +1531,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1598,7 +1556,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1624,7 +1581,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1650,7 +1606,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1676,7 +1631,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1702,7 +1656,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1728,7 +1681,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1754,7 +1706,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1780,7 +1731,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1806,7 +1756,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1832,7 +1781,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1858,7 +1806,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1884,7 +1831,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1910,7 +1856,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1936,7 +1881,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1962,7 +1906,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1988,7 +1931,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -2014,7 +1956,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -2040,7 +1981,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2021), by_va: false, @@ -2066,7 +2006,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2020), by_va: false, @@ -2092,7 +2031,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2020), by_va: false, @@ -2118,7 +2056,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2144,7 +2081,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2170,7 +2106,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2196,7 +2131,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2222,7 +2156,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2248,7 +2181,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2274,7 +2206,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2300,7 +2231,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2326,7 +2256,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2352,7 +2281,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2378,7 +2306,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2404,7 +2331,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2430,7 +2356,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2456,7 +2381,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2482,7 +2406,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2508,7 +2431,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2534,7 +2456,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2560,7 +2481,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2586,7 +2506,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2612,7 +2531,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2019), by_va: false, @@ -2638,7 +2556,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2018), by_va: false, @@ -2664,7 +2581,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2018), by_va: false, @@ -2690,7 +2606,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2018), by_va: false, @@ -2716,7 +2631,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2018), by_va: false, @@ -2742,7 +2656,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2768,7 +2681,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2794,7 +2706,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2820,7 +2731,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2846,7 +2756,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2872,7 +2781,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2898,7 +2806,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2924,7 +2831,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2950,7 +2856,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -2976,7 +2881,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -3002,7 +2906,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -3028,7 +2931,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -3054,7 +2956,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2017), by_va: false, @@ -3080,7 +2981,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3106,7 +3006,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3132,7 +3031,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3158,7 +3056,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3184,7 +3081,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3210,7 +3106,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3236,7 +3131,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2014), by_va: false, @@ -3262,7 +3156,6 @@ 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 c490136..9393d27 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,7 +506,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2021), by_va: false, @@ -532,7 +531,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2019), by_va: false, @@ -558,7 +556,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2017), by_va: false, @@ -584,7 +581,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2014), by_va: false, @@ -610,7 +606,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2014), by_va: false, @@ -636,7 +631,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2011), by_va: false, @@ -662,7 +656,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2011), by_va: false, @@ -688,7 +681,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2010), by_va: false, @@ -714,7 +706,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Album, year: Some(2010), by_va: false, @@ -740,7 +731,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Ep, year: Some(2009), by_va: false, @@ -766,7 +756,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -792,7 +781,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -818,7 +806,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -844,7 +831,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -870,7 +856,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -896,7 +881,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -922,7 +906,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -948,7 +931,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -974,7 +956,6 @@ MusicArtist( name: "Ed Sheeran", ), ], - artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), album_type: Single, year: Some(2022), by_va: false, @@ -1000,7 +981,6 @@ 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 523501b..c4e2f68 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,7 +409,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2019), by_va: false, @@ -435,7 +434,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2016), by_va: false, @@ -461,7 +459,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2015), by_va: false, @@ -487,7 +484,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2014), by_va: false, @@ -513,7 +509,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2020), by_va: false, @@ -539,7 +534,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2020), by_va: false, @@ -565,7 +559,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2019), by_va: false, @@ -591,7 +584,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2017), by_va: false, @@ -617,7 +609,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2017), by_va: false, @@ -643,7 +634,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2016), by_va: false, @@ -669,7 +659,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2016), by_va: false, @@ -695,7 +684,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2014), by_va: false, @@ -721,7 +709,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2014), by_va: false, @@ -747,7 +734,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2007), by_va: false, @@ -773,7 +759,6 @@ 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 9364d01..0eaf66a 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,7 +510,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Album, year: Some(2022), by_va: false, @@ -536,7 +535,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Album, year: Some(2022), by_va: false, @@ -562,7 +560,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Album, year: Some(2018), by_va: false, @@ -588,7 +585,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Album, year: Some(2017), by_va: false, @@ -614,7 +610,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Album, year: Some(2014), by_va: false, @@ -640,7 +635,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Album, year: Some(2011), by_va: false, @@ -666,7 +660,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Ep, year: Some(2010), by_va: false, @@ -692,7 +685,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Ep, year: Some(2009), by_va: false, @@ -718,7 +710,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Ep, year: Some(2017), by_va: false, @@ -744,7 +735,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2022), by_va: false, @@ -770,7 +760,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2022), by_va: false, @@ -796,7 +785,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2022), by_va: false, @@ -822,7 +810,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2022), by_va: false, @@ -848,7 +835,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2021), by_va: false, @@ -874,7 +860,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2021), by_va: false, @@ -900,7 +885,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2021), by_va: false, @@ -926,7 +910,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2021), by_va: false, @@ -952,7 +935,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2021), by_va: false, @@ -978,7 +960,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2021), by_va: false, @@ -1004,7 +985,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2019), by_va: false, @@ -1030,7 +1010,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2018), by_va: false, @@ -1056,7 +1035,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2018), by_va: false, @@ -1082,7 +1060,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2018), by_va: false, @@ -1108,7 +1085,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2017), by_va: false, @@ -1134,7 +1110,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2017), by_va: false, @@ -1160,7 +1135,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2017), by_va: false, @@ -1186,7 +1160,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2017), by_va: false, @@ -1212,7 +1185,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2017), by_va: false, @@ -1238,7 +1210,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2016), by_va: false, @@ -1264,7 +1235,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2016), by_va: false, @@ -1290,7 +1260,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2015), by_va: false, @@ -1316,7 +1285,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2015), by_va: false, @@ -1342,7 +1310,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2015), by_va: false, @@ -1368,7 +1335,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2015), by_va: false, @@ -1394,7 +1360,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2015), by_va: false, @@ -1420,7 +1385,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2014), by_va: false, @@ -1446,7 +1410,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2014), by_va: false, @@ -1472,7 +1435,6 @@ MusicArtist( name: "Imagine Dragons", ), ], - artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"), album_type: Single, year: Some(2014), by_va: false, @@ -1498,7 +1460,6 @@ 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 0854547..518e085 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,7 +432,6 @@ 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 f153a10..b0c6db6 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,7 +741,6 @@ MusicRelated( name: "aespa", ), ], - artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), album_type: Album, year: Some(2022), by_va: false, @@ -767,7 +766,6 @@ 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 a545850..86d0cd7 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,7 +24,6 @@ expression: map_res.c name: "Dermot Kennedy", ), ], - artist_id: Some("UClHxZy_9ArA6rploIzcDReQ"), album_type: Album, year: None, by_va: false, @@ -50,7 +49,6 @@ expression: map_res.c name: "Capital Bra", ), ], - artist_id: Some("UCa7FGSUsN2wNRUclibmicMg"), album_type: Single, year: None, by_va: false, @@ -76,7 +74,6 @@ expression: map_res.c name: "Sarah Connor", ), ], - artist_id: Some("UCRD-INDaHvHlO8K_33uKetQ"), album_type: Album, year: None, by_va: false, @@ -106,7 +103,6 @@ expression: map_res.c name: "FOURTY", ), ], - artist_id: Some("UCFrNQgyEQz5fRIW90uqP7rw"), album_type: Album, year: None, by_va: false, @@ -132,7 +128,6 @@ expression: map_res.c name: "FLETCHER", ), ], - artist_id: Some("UCzrpaSWxEkjeKfoSR2L7OzQ"), album_type: Album, year: None, by_va: false, @@ -162,7 +157,6 @@ expression: map_res.c name: "Enyadres", ), ], - artist_id: Some("UCXnN-eHLEDBJKjV12WzfYMw"), album_type: Single, year: None, by_va: false, @@ -188,7 +182,6 @@ expression: map_res.c name: "mazie", ), ], - artist_id: Some("UC0_KSKflVDkoLYKg4vNGO1A"), album_type: Single, year: None, by_va: false, @@ -218,7 +211,6 @@ expression: map_res.c name: "Joel Brandenstein", ), ], - artist_id: Some("UCc_iRXEpehN-dDTkPLoBjZg"), album_type: Single, year: None, by_va: false, @@ -244,7 +236,6 @@ expression: map_res.c name: "Gert Steinbäcker", ), ], - artist_id: Some("UCpVPM62RMcDpjmXacKIEosg"), album_type: Album, year: None, by_va: false, @@ -270,7 +261,6 @@ expression: map_res.c name: "Rammstein", ), ], - artist_id: Some("UCs6GGpd9zvsYghuYe0VDFUQ"), album_type: Single, year: None, by_va: false, @@ -296,7 +286,6 @@ expression: map_res.c name: "1986zig", ), ], - artist_id: Some("UCg3M7Pk71xLoQ7rfeGYfzUw"), album_type: Album, year: None, by_va: false, @@ -326,7 +315,6 @@ expression: map_res.c name: "Kim Petras", ), ], - artist_id: Some("UCgpBsaDW2n_6ruzht3wvP0A"), album_type: Single, year: None, by_va: false, @@ -352,7 +340,6 @@ expression: map_res.c name: "Mehdi YZ", ), ], - artist_id: Some("UCjQ_EknxA-PSdgzXvKpCKYg"), album_type: Album, year: None, by_va: false, @@ -378,7 +365,6 @@ expression: map_res.c name: "Helene Fischer", ), ], - artist_id: Some("UCE7_p3lcXA-YXRZp2PjrgYw"), album_type: Ep, year: None, by_va: false, @@ -404,7 +390,6 @@ expression: map_res.c name: "DJ Ötzi", ), ], - artist_id: Some("UCOPDRGEfpw2kmMypQz-iW8Q"), album_type: Album, year: None, by_va: false, @@ -430,7 +415,6 @@ expression: map_res.c name: "Taylor Swift", ), ], - artist_id: Some("UCPC0L1d253x-KuMNwa05TpA"), album_type: Single, year: None, by_va: false, @@ -456,7 +440,6 @@ expression: map_res.c name: "Roman Nagel", ), ], - artist_id: Some("UCAqZTXTRBQMyK73Zlq5n0eQ"), album_type: Single, year: None, by_va: false, @@ -482,7 +465,6 @@ expression: map_res.c name: "Farid Bang", ), ], - artist_id: Some("UC4gi504gkSyoXt9vfaGUr9A"), album_type: Ep, year: None, by_va: false, @@ -508,7 +490,6 @@ expression: map_res.c name: "Matze Knop", ), ], - artist_id: Some("UC90P3pg6Sa2cqHxdXrVPorQ"), album_type: Single, year: None, by_va: false, @@ -534,7 +515,6 @@ expression: map_res.c name: "Nina Chuba", ), ], - artist_id: Some("UCtBk1TIUH15p2pJvKFtPjgA"), album_type: Single, year: None, by_va: false, @@ -560,7 +540,6 @@ expression: map_res.c name: "Rozzi", ), ], - artist_id: Some("UCizMcrm1SSYA-Gascg05S4g"), album_type: Album, year: None, by_va: false, @@ -586,7 +565,6 @@ expression: map_res.c name: "Stereoact", ), ], - artist_id: Some("UCxpEXfdz8GpczOZ8axPLApg"), album_type: Single, year: None, by_va: false, @@ -612,7 +590,6 @@ expression: map_res.c name: "Nickelback", ), ], - artist_id: Some("UC1T4LYUer48KhKlrru13kUg"), album_type: Album, year: None, by_va: false, @@ -638,7 +615,6 @@ expression: map_res.c name: "Montez", ), ], - artist_id: Some("UCccQ2_F-L5EQo6wEdqBkxHA"), album_type: Single, year: None, by_va: false, @@ -664,7 +640,6 @@ expression: map_res.c name: "Alexandra Hamilton-Ayres", ), ], - artist_id: Some("UCE7DD2CgO3MFCsGQyiWYe-w"), album_type: Album, year: None, by_va: false, @@ -698,7 +673,6 @@ expression: map_res.c name: "Joshi Mizu", ), ], - artist_id: Some("UCsPz48w0M3QUEGAiDP1x17w"), album_type: Single, year: None, by_va: false, @@ -724,7 +698,6 @@ expression: map_res.c name: "Kyle Lionhart", ), ], - artist_id: Some("UC_PsyV7331J1aX4368v10pw"), album_type: Album, year: None, by_va: false, @@ -754,7 +727,6 @@ expression: map_res.c name: "Bazzazian", ), ], - artist_id: Some("UC-fLJhhYstbX8ns-mYKsH_Q"), album_type: Single, year: None, by_va: false, @@ -780,7 +752,6 @@ expression: map_res.c name: "Granger Smith", ), ], - artist_id: Some("UCRsN329XrgDGxuYnxXZQiOQ"), album_type: Album, year: None, by_va: false, @@ -810,7 +781,6 @@ expression: map_res.c name: "treamiboii", ), ], - artist_id: Some("UCzFoNWzy9myd8p68utSdqow"), album_type: Single, year: None, by_va: false, @@ -836,7 +806,6 @@ expression: map_res.c name: "Joan Armatrading", ), ], - artist_id: Some("UCD4XPfsYpY2h-5qQiKL8gEw"), album_type: Album, year: None, by_va: false, @@ -862,7 +831,6 @@ expression: map_res.c name: "Alan Walker", ), ], - artist_id: Some("UCaXJEi-wOOVe2eZZHzyz4mQ"), album_type: Single, year: None, by_va: false, @@ -888,7 +856,6 @@ expression: map_res.c name: "Joe Strummer", ), ], - artist_id: Some("UCBzD5ci0CGt_ZhKJw4aZhaQ"), album_type: Album, year: None, by_va: false, @@ -922,7 +889,6 @@ expression: map_res.c name: "Hamza", ), ], - artist_id: Some("UCdbasYA6lUSImvxdqS1RuZQ"), album_type: Single, year: None, by_va: false, @@ -948,7 +914,6 @@ expression: map_res.c name: "Richard Clayderman", ), ], - artist_id: Some("UCCtxJeSaG4jEX-dt3dwx48A"), album_type: Album, year: None, by_va: false, @@ -974,7 +939,6 @@ expression: map_res.c name: "Jennifer Lopez", ), ], - artist_id: Some("UCXDcGa1H1axtr1wkxOR3hZQ"), album_type: Album, year: None, by_va: false, @@ -1000,7 +964,6 @@ expression: map_res.c name: "Saweetie", ), ], - artist_id: Some("UCqTaQGqjAI6fYkr84KZgZEg"), album_type: Ep, year: None, by_va: false, @@ -1026,7 +989,6 @@ expression: map_res.c name: "IMMI", ), ], - artist_id: Some("UCeCsfhcY09c-UvX7DkQDcUw"), album_type: Ep, year: None, by_va: false, @@ -1052,7 +1014,6 @@ expression: map_res.c name: "Disturbed", ), ], - artist_id: Some("UCMHHDXMvnMKRzuEKtMe8ZRA"), album_type: Album, year: None, by_va: false, @@ -1082,7 +1043,6 @@ expression: map_res.c name: "Georgie Riot", ), ], - artist_id: Some("UCoOFEu6s0wk7CUljMh8wisw"), album_type: Single, year: None, by_va: false, @@ -1108,7 +1068,6 @@ expression: map_res.c name: "Lucienne Renaudin Vary", ), ], - artist_id: Some("UCkUheY8pKWamT7BLzQSBzEQ"), album_type: Album, year: None, by_va: false, @@ -1134,7 +1093,6 @@ expression: map_res.c name: "NEFFEX", ), ], - artist_id: Some("UC281fR3Rg1O08xpxArdbdew"), album_type: Single, year: None, by_va: false, @@ -1164,7 +1122,6 @@ expression: map_res.c name: "Crazy Horse", ), ], - artist_id: Some("UC6JhadLTf6g6f-ZdeEaAqBQ"), album_type: Album, year: None, by_va: false, @@ -1190,7 +1147,6 @@ expression: map_res.c name: "Dermot Kennedy", ), ], - artist_id: Some("UClHxZy_9ArA6rploIzcDReQ"), album_type: Single, year: None, by_va: false, @@ -1216,7 +1172,6 @@ expression: map_res.c name: "Fifteen", ), ], - artist_id: Some("UCMlwPZO5rmB_v_ndvZ_fTPQ"), album_type: Ep, year: None, by_va: false, @@ -1250,7 +1205,6 @@ expression: map_res.c name: "Bastidas", ), ], - artist_id: Some("UCQCDX-NwtNYXcRaVRCmIZKw"), album_type: Single, year: None, by_va: false, @@ -1276,7 +1230,6 @@ expression: map_res.c name: "NICO", ), ], - artist_id: Some("UCI1oAsRUrmEG3J4Bj9c6ORw"), album_type: Album, year: None, by_va: false, @@ -1302,7 +1255,6 @@ expression: map_res.c name: "O.G.", ), ], - artist_id: Some("UCDPnXJIiNwEtXqi1qyLbj0w"), album_type: Single, year: None, by_va: false, @@ -1328,7 +1280,6 @@ expression: map_res.c name: "Freddie Long", ), ], - artist_id: Some("UCExSlmVhYeJca_Jjl52zFcw"), album_type: Single, year: None, by_va: false, @@ -1354,7 +1305,6 @@ expression: map_res.c name: "Machine Gun Kelly", ), ], - artist_id: Some("UCDbLC4CaZzi4jt5KyAF0ZQw"), album_type: Single, year: None, by_va: false, @@ -1380,7 +1330,6 @@ expression: map_res.c name: "KeKe", ), ], - artist_id: Some("UC4aep5QQu4CC9sfgovVcffQ"), album_type: Ep, year: None, by_va: false, @@ -1410,7 +1359,6 @@ expression: map_res.c name: "Wildstylez", ), ], - artist_id: Some("UCAeLFBCQS7FvI8PvBrWvSBg"), album_type: Single, year: None, by_va: false, @@ -1436,7 +1384,6 @@ expression: map_res.c name: "Lena&Linus", ), ], - artist_id: Some("UC7qLvzWBYKOiO1Xw3EAgg4w"), album_type: Single, year: None, by_va: false, @@ -1466,7 +1413,6 @@ expression: map_res.c name: "Jay Sean", ), ], - artist_id: Some("UC87-yfmlLTjCf4TnUQ8bWgA"), album_type: Single, year: None, by_va: false, @@ -1492,7 +1438,6 @@ expression: map_res.c name: "Swiss & Die Andern", ), ], - artist_id: Some("UC5uhzuItRbptRuvZdFd15yw"), album_type: Single, year: None, by_va: false, @@ -1518,7 +1463,6 @@ expression: map_res.c name: "HoodBlaq", ), ], - artist_id: Some("UC2FbxmIdK0UIt2V3phUQg5Q"), album_type: Single, year: None, by_va: false, @@ -1544,7 +1488,6 @@ expression: map_res.c name: "Schimmerling", ), ], - artist_id: Some("UCkTzRJf2nUfzwgi6KuIiggg"), album_type: Ep, year: None, by_va: false, @@ -1570,7 +1513,6 @@ expression: map_res.c name: "Red Hot Chili Peppers", ), ], - artist_id: Some("UCrSorX845CEWXzU4Z7BojjA"), album_type: Single, year: None, by_va: false, @@ -1600,7 +1542,6 @@ expression: map_res.c name: "Dardan", ), ], - artist_id: Some("UCiBODJaGfd1aBHE7BF_Iv7w"), album_type: Single, year: None, by_va: false, @@ -1626,7 +1567,6 @@ expression: map_res.c name: "KALIM", ), ], - artist_id: Some("UClIoHK6CtwuMQCEd0n0bOxQ"), album_type: Single, year: None, by_va: false, @@ -1652,7 +1592,6 @@ expression: map_res.c name: "Wolfgang Petry", ), ], - artist_id: Some("UC1JrQ9TyOAcXdcDa2Jx3SCQ"), album_type: Single, year: None, by_va: false, @@ -1678,7 +1617,6 @@ expression: map_res.c name: "Lorenz Büffel", ), ], - artist_id: Some("UCqZPGciX12nh1yiWGfrw8lg"), album_type: Single, year: None, by_va: false, @@ -1704,7 +1642,6 @@ expression: map_res.c name: "Juju", ), ], - artist_id: Some("UCY2f-ZnXFcL6vjtVr0ELzxA"), album_type: Single, year: None, by_va: false, @@ -1738,7 +1675,6 @@ expression: map_res.c name: "Masked Wolf", ), ], - artist_id: Some("UCHUPrayXP0esjzq4Dcvn1NA"), album_type: Single, year: None, by_va: false, @@ -1764,7 +1700,6 @@ expression: map_res.c name: "Yung Hurn", ), ], - artist_id: Some("UCwrvM6h3SUIk2Wo63ySfLNQ"), album_type: Single, year: None, by_va: false, @@ -1790,7 +1725,6 @@ expression: map_res.c name: "Ella Henderson", ), ], - artist_id: Some("UCWN8EUD00PTyo5QQ5ueRr-A"), album_type: Album, year: None, by_va: false, @@ -1816,7 +1750,6 @@ expression: map_res.c name: "Madonna", ), ], - artist_id: Some("UCo4CrqhIV_tSOGdDWfVyCsg"), album_type: Album, year: None, by_va: false, @@ -1842,7 +1775,6 @@ expression: map_res.c name: "KAYEF", ), ], - artist_id: Some("UCp1Rxq0nIVoeljRfJn8yKbg"), album_type: Single, year: None, by_va: false, @@ -1868,7 +1800,6 @@ expression: map_res.c name: "AnnenMayKantereit", ), ], - artist_id: Some("UCK2ZLsY9Mb_dxZiZfKE3lGg"), album_type: Single, year: None, by_va: false, @@ -1898,7 +1829,6 @@ expression: map_res.c name: "Kenan", ), ], - artist_id: None, album_type: Single, year: None, by_va: false, @@ -1928,7 +1858,6 @@ expression: map_res.c name: "Britney Spears", ), ], - artist_id: Some("UCn9i4cdLe14CbsOycTbKMoA"), album_type: Single, year: None, by_va: false, @@ -1954,7 +1883,6 @@ expression: map_res.c name: "Edo Saiya", ), ], - artist_id: Some("UCd-REfvSbRwndM82NWDJ_qg"), album_type: Single, year: None, by_va: false, @@ -1980,7 +1908,6 @@ expression: map_res.c name: "Hans Zimmer", ), ], - artist_id: Some("UCfCNL5oajlQBAlyjWv1ChVw"), album_type: Album, year: None, by_va: false, @@ -2010,7 +1937,6 @@ expression: map_res.c name: "Manele Mentolate", ), ], - artist_id: Some("UCUfYDPYsR_AVR8cvcIB_YDA"), album_type: Single, year: None, by_va: false, @@ -2044,7 +1970,6 @@ expression: map_res.c name: "Aukoustics", ), ], - artist_id: Some("UC3VBeY60GWWpe3w8b4QWDYQ"), album_type: Single, year: None, by_va: false, @@ -2070,7 +1995,6 @@ expression: map_res.c name: "102 Boyz", ), ], - artist_id: Some("UCKGnuwghxYaf_KIXzK7ATIA"), album_type: Single, year: None, by_va: false, @@ -2104,7 +2028,6 @@ expression: map_res.c name: "Myriam Fares", ), ], - artist_id: Some("UCTTcTeAszDGxALRSMkJH9FQ"), album_type: Single, year: None, by_va: false, @@ -2130,7 +2053,6 @@ expression: map_res.c name: "Heinz Rudolf Kunze", ), ], - artist_id: Some("UCobgi-0C_8rBLNuMleLNUKQ"), album_type: Album, year: None, by_va: false, @@ -2156,7 +2078,6 @@ expression: map_res.c name: "The Rolling Stones", ), ], - artist_id: Some("UCNYhhkQqeFLUc-YEDcLpSYQ"), album_type: Ep, year: None, by_va: false, @@ -2182,7 +2103,6 @@ expression: map_res.c name: "Queen", ), ], - artist_id: Some("UCEPMVbUzImPl4p8k4LkGevA"), album_type: Album, year: None, by_va: false, @@ -2208,7 +2128,6 @@ expression: map_res.c name: "01099", ), ], - artist_id: Some("UC4D9yS9Pa7EdpcCHfd8gAiw"), album_type: Single, year: None, by_va: false, @@ -2242,7 +2161,6 @@ expression: map_res.c name: "W&W", ), ], - artist_id: Some("UCjpBcfMn2g8afa3XIZmS3mw"), album_type: Single, year: None, by_va: false, @@ -2268,7 +2186,6 @@ expression: map_res.c name: "Ikke Hüftgold", ), ], - artist_id: Some("UChUTaY5E47rD4njRw7jnYWA"), album_type: Single, year: None, by_va: false, @@ -2298,7 +2215,6 @@ expression: map_res.c name: "Da Mouth of Madness", ), ], - artist_id: Some("UC4vOKBROawrqTT4sSdNNIEQ"), album_type: Single, year: None, by_va: false, @@ -2324,7 +2240,6 @@ expression: map_res.c name: "HIGHTKK", ), ], - artist_id: Some("UCmir5ihSc8-9nRcKJjFLpLQ"), album_type: Single, year: None, by_va: false, @@ -2350,7 +2265,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2376,7 +2290,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2402,7 +2315,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2428,7 +2340,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2454,7 +2365,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2480,7 +2390,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2506,7 +2415,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2532,7 +2440,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2558,7 +2465,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -2584,7 +2490,6 @@ expression: map_res.c name: "Salvatore Ganacci", ), ], - artist_id: Some("UCgS5mGElzt2UvcWAZhxd7Jg"), album_type: Album, year: None, by_va: false, @@ -2614,7 +2519,6 @@ expression: map_res.c name: "Matthew Tasa", ), ], - artist_id: Some("UCdwyRvg87lMQlZ7A5HXlAXQ"), album_type: Single, year: None, by_va: false, @@ -2640,7 +2544,6 @@ expression: map_res.c name: "El Alfa", ), ], - artist_id: Some("UCJMzvcg3QxvaTKfpaj57TyA"), album_type: Album, year: None, by_va: false, @@ -2666,7 +2569,6 @@ expression: map_res.c name: "GIMS", ), ], - artist_id: Some("UCanUjmTDohFr8OMpfk5xWBQ"), album_type: Single, year: None, by_va: false, @@ -2692,7 +2594,6 @@ expression: map_res.c name: "Execute", ), ], - artist_id: Some("UCvsCS3G5AHUPBwJrX69VdOw"), album_type: Single, year: None, by_va: false, @@ -2718,7 +2619,6 @@ expression: map_res.c name: "Pietro Lombardi", ), ], - artist_id: Some("UCmM8X1eVACcgB6LxVMqTMeQ"), album_type: Single, year: None, by_va: false, @@ -2744,7 +2644,6 @@ expression: map_res.c name: "Aaron Black", ), ], - artist_id: Some("UCPRysewl9FiinLnzA9SMULw"), album_type: Album, year: None, by_va: false, @@ -2778,7 +2677,6 @@ expression: map_res.c name: "Jay Mason", ), ], - artist_id: Some("UCMXEXLCy9nNjykl0sxlzz0w"), album_type: Single, year: None, by_va: false, @@ -2804,7 +2702,6 @@ expression: map_res.c name: "Majoe", ), ], - artist_id: Some("UCqy_XhL-yur1zdHeKTRDB5g"), album_type: Single, year: None, by_va: false, @@ -2830,7 +2727,6 @@ expression: map_res.c name: "JUJU", ), ], - artist_id: Some("UCJDDeY50cfuDeivwBFZVxLw"), album_type: Ep, year: None, by_va: false, @@ -2856,7 +2752,6 @@ expression: map_res.c name: "James Arthur", ), ], - artist_id: Some("UCNAbUat5xDtp6FeBphe2V_Q"), album_type: Single, year: None, by_va: false, @@ -2886,7 +2781,6 @@ expression: map_res.c name: "Olly Gi", ), ], - artist_id: Some("UCEpSzaxLXatwXlujpF-neQg"), album_type: Single, year: None, by_va: false, @@ -2912,7 +2806,6 @@ expression: map_res.c name: "Zivert", ), ], - artist_id: Some("UCHhV79vwD5W4UZJdJPGE1DQ"), album_type: Single, year: None, by_va: false, @@ -2938,7 +2831,6 @@ expression: map_res.c name: "Alexander Eder", ), ], - artist_id: Some("UClWYTAbTNH9p80shT8yPHqg"), album_type: Single, year: None, by_va: false, @@ -2972,7 +2864,6 @@ expression: map_res.c name: "HARDSTYLE BRAH", ), ], - artist_id: Some("UCdchfYz_9BJz7htrmiCWSOg"), album_type: Single, year: None, by_va: false, @@ -3006,7 +2897,6 @@ expression: map_res.c name: "Stockanotti", ), ], - artist_id: None, album_type: Single, year: None, by_va: false, @@ -3032,7 +2922,6 @@ expression: map_res.c name: "Busta Rhymes", ), ], - artist_id: Some("UCaSeNTljGkpoj1ijhs72nag"), album_type: Ep, year: None, by_va: false, @@ -3062,7 +2951,6 @@ expression: map_res.c name: "ANNA ASTI", ), ], - artist_id: Some("UCUSr-73IZLwrjOozma9Ad_w"), album_type: Single, year: None, by_va: false, @@ -3088,7 +2976,6 @@ expression: map_res.c name: "Lil Jon", ), ], - artist_id: Some("UC-TDzpXxJndgBvyX4dZXVzA"), album_type: Album, year: None, by_va: false, @@ -3114,7 +3001,6 @@ expression: map_res.c name: "Roddy Ricch", ), ], - artist_id: Some("UCC30L98-rMHfY5PJ46duOPg"), album_type: Album, year: None, by_va: false, @@ -3140,7 +3026,6 @@ expression: map_res.c name: "Mark Jack", ), ], - artist_id: Some("UC5rkoI4r3QaSK1gKMxjqmig"), album_type: Album, year: None, by_va: false, @@ -3170,7 +3055,6 @@ expression: map_res.c name: "BTS", ), ], - artist_id: Some("UC-pOuHFcndLpyfWSPVqXt_A"), album_type: Single, year: None, by_va: false, @@ -3204,7 +3088,6 @@ expression: map_res.c name: "Ellie Goulding", ), ], - artist_id: Some("UCyeThGzVYx1MbxUGgIkj3iQ"), album_type: Single, year: None, by_va: false, @@ -3238,7 +3121,6 @@ expression: map_res.c name: "Dastic", ), ], - artist_id: Some("UCUAvCvdLFoPItXgjYy0P7CQ"), album_type: Single, year: None, by_va: false, @@ -3264,7 +3146,6 @@ expression: map_res.c name: "Stormzy", ), ], - artist_id: Some("UCFsLMFP9I8tqxnZZNGKfPow"), album_type: Album, year: None, by_va: false, @@ -3294,7 +3175,6 @@ expression: map_res.c name: "Durdenhauer", ), ], - artist_id: Some("UCsfPXoStha2wqN8hB9dFR2g"), album_type: Single, year: None, by_va: false, @@ -3320,7 +3200,6 @@ expression: map_res.c name: "Teddy Specter", ), ], - artist_id: Some("UCSTEV2xPTlynyEZ3QbbVB5w"), album_type: Album, year: None, by_va: false, @@ -3350,7 +3229,6 @@ expression: map_res.c name: "Lorna Courtney", ), ], - artist_id: Some("UCpXP9-cHlJCMapSYCSZThbw"), album_type: Single, year: None, by_va: false, @@ -3376,7 +3254,6 @@ expression: map_res.c name: "Senidah", ), ], - artist_id: Some("UCmBSyM3ScU07ecv8w8dWvIQ"), album_type: Album, year: None, by_va: false, @@ -3406,7 +3283,6 @@ expression: map_res.c name: "ODMGDIA", ), ], - artist_id: Some("UC8JxlMZ9VPddCuQGwB49fYg"), album_type: Single, year: None, by_va: false, @@ -3432,7 +3308,6 @@ expression: map_res.c name: "Ary", ), ], - artist_id: Some("UC84f7RfWO0kppDO8gbWUPhA"), album_type: Ep, year: None, by_va: false, @@ -3458,7 +3333,6 @@ expression: map_res.c name: "Nisa", ), ], - artist_id: Some("UCTL5jJqSn3tNkk1q3Nrl3gA"), album_type: Single, year: None, by_va: false, @@ -3484,7 +3358,6 @@ expression: map_res.c name: "Eloy de Jong", ), ], - artist_id: Some("UCpvDuL_5kV0teEg2QtbaAWw"), album_type: Ep, year: None, by_va: false, @@ -3510,7 +3383,6 @@ expression: map_res.c name: "Herbert Grönemeyer", ), ], - artist_id: Some("UCpgBROkXWpGzEMXnz0LGHbg"), album_type: Single, year: None, by_va: false, @@ -3536,7 +3408,6 @@ expression: map_res.c name: "Tokio Hotel", ), ], - artist_id: Some("UCsvnoEFghphdrpWIsK6wqDg"), album_type: Album, year: None, by_va: false, @@ -3562,7 +3433,6 @@ expression: map_res.c name: "Unlike Pluto", ), ], - artist_id: Some("UC1LmxpB0f-eVMB7X_9ziTVg"), album_type: Album, year: None, by_va: false, @@ -3588,7 +3458,6 @@ expression: map_res.c name: "Bad Bunny", ), ], - artist_id: Some("UCiY3z8HAGD6BlSNKVn2kSvQ"), album_type: Single, year: None, by_va: false, @@ -3614,7 +3483,6 @@ expression: map_res.c name: "Mike Candys", ), ], - artist_id: Some("UC0Fpo5Sndk_WLcHAMXeJDPQ"), album_type: Single, year: None, by_va: false, @@ -3644,7 +3512,6 @@ expression: map_res.c name: "Tom Grennan", ), ], - artist_id: Some("UCW7eCgFY16p3tWesVwfC1yA"), album_type: Single, year: None, by_va: false, @@ -3674,7 +3541,6 @@ expression: map_res.c name: "BHZ", ), ], - artist_id: Some("UC5RhS3EM_CYfIL0LYWveDrA"), album_type: Single, year: None, by_va: false, @@ -3700,7 +3566,6 @@ expression: map_res.c name: "Nicolae Guta", ), ], - artist_id: Some("UCAkTuOHJleyE4lk-n_taf9A"), album_type: Single, year: None, by_va: false, @@ -3726,7 +3591,6 @@ expression: map_res.c name: "Robbie Williams", ), ], - artist_id: Some("UCmAgTXAlnckJJBFmqYlHnNA"), album_type: Single, year: None, by_va: false, @@ -3752,7 +3616,6 @@ expression: map_res.c name: "Vanessa Mai", ), ], - artist_id: Some("UCFTcSVPYRWlDoHisR-ZKwgw"), album_type: Single, year: None, by_va: false, @@ -3786,7 +3649,6 @@ expression: map_res.c name: "Moonshine", ), ], - artist_id: Some("UCQTiCJddISPD9BwAq4wWrsw"), album_type: Single, year: None, by_va: false, @@ -3812,7 +3674,6 @@ expression: map_res.c name: "Rnbstylerz", ), ], - artist_id: Some("UC-g1V9YrA8Fg13BwcG_W-4g"), album_type: Single, year: None, by_va: false, @@ -3838,7 +3699,6 @@ expression: map_res.c name: "Raportagen", ), ], - artist_id: Some("UCsagRjawwvj9-bybPFt5d-w"), album_type: Single, year: None, by_va: false, @@ -3864,7 +3724,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -3890,7 +3749,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -3916,7 +3774,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -3942,7 +3799,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -3968,7 +3824,6 @@ expression: map_res.c name: "Entspannungsmusik", ), ], - artist_id: Some("UCa71Sv2jz9HbGkd66WXvEeA"), album_type: Album, year: None, by_va: false, @@ -3994,7 +3849,6 @@ expression: map_res.c name: "Hemso", ), ], - artist_id: Some("UCx8wewQwEdHFWPf7TYwAGvA"), album_type: Single, year: None, by_va: false, @@ -4020,7 +3874,6 @@ expression: map_res.c name: "Alle Farben", ), ], - artist_id: Some("UC-ne4DOpdAkBqXhFGRcI7xw"), album_type: Single, year: None, by_va: false, @@ -4050,7 +3903,6 @@ expression: map_res.c name: "HEALTH", ), ], - artist_id: Some("UCdSgOgQ0WtelXBMKF3tDsqg"), album_type: Single, year: None, by_va: false, @@ -4076,7 +3928,6 @@ expression: map_res.c name: "Sefo", ), ], - artist_id: Some("UCQOiZrSMNwNiyLH2fNqNYNw"), album_type: Single, year: None, by_va: false, @@ -4102,7 +3953,6 @@ expression: map_res.c name: "Iron Maiden", ), ], - artist_id: Some("UC0zbzp6x7zR8u0LhanNWFyw"), album_type: Single, year: None, by_va: false, @@ -4128,7 +3978,6 @@ expression: map_res.c name: "Ozuna", ), ], - artist_id: Some("UCKEFjh4JL-OyMI8z3h5Coaw"), album_type: Single, year: None, by_va: false, @@ -4154,7 +4003,6 @@ expression: map_res.c name: "Natalie Jane", ), ], - artist_id: Some("UCcZVM-P7y-p4wUkro4YZHCg"), album_type: Single, year: None, by_va: false, @@ -4180,7 +4028,6 @@ expression: map_res.c name: "Gorillaz", ), ], - artist_id: Some("UCNIV5B_aJnLrKDSnW_MOmcQ"), album_type: Single, year: None, by_va: false, @@ -4206,7 +4053,6 @@ expression: map_res.c name: "1nonly", ), ], - artist_id: Some("UC4XHSTHLOwFvFiZj4gFqMsA"), album_type: Ep, year: None, by_va: false, @@ -4236,7 +4082,6 @@ expression: map_res.c name: "Ramaj Eroc", ), ], - artist_id: Some("UCKh0FImZMYvIZHzMSlbschg"), album_type: Single, year: None, by_va: false, @@ -4262,7 +4107,6 @@ expression: map_res.c name: "Don Goliath", ), ], - artist_id: Some("UCrSq-XRASp4clbiECIzD09g"), album_type: Album, year: None, by_va: false, @@ -4296,7 +4140,6 @@ expression: map_res.c name: "Trap-A-Holics", ), ], - artist_id: Some("UCGwa7ZUGHL9pisTwM1rUIRQ"), album_type: Album, year: None, by_va: false, @@ -4322,7 +4165,6 @@ expression: map_res.c name: "Don Omar", ), ], - artist_id: Some("UCTrIOPtBeAN2E0R-sgU9JxA"), album_type: Single, year: None, by_va: false, @@ -4348,7 +4190,6 @@ expression: map_res.c name: "Zarka Voya", ), ], - artist_id: Some("UCc6C8g9N1gfQfB1ebDG_3ww"), album_type: Album, year: None, by_va: false, @@ -4378,7 +4219,6 @@ expression: map_res.c name: "Nikster", ), ], - artist_id: None, album_type: Single, year: None, by_va: false, @@ -4404,7 +4244,6 @@ expression: map_res.c name: "Jose Stan", ), ], - artist_id: Some("UCAz_-i_z6Rf66dYop52ElSA"), album_type: Album, year: None, by_va: false, @@ -4434,7 +4273,6 @@ expression: map_res.c name: "kizary", ), ], - artist_id: Some("UCK0E138ftvcNWus81A4zQ2A"), album_type: Single, year: None, by_va: false, @@ -4460,7 +4298,6 @@ expression: map_res.c name: "Simon Decker", ), ], - artist_id: Some("UCeXYHFfN53Bw_4dbPLlJgrA"), album_type: Album, year: None, by_va: false, @@ -4486,7 +4323,6 @@ expression: map_res.c name: "Gentleman", ), ], - artist_id: Some("UCywFOWItbhJH6oZadxC2VkQ"), album_type: Single, year: None, by_va: false, @@ -4516,7 +4352,6 @@ expression: map_res.c name: "Jack Center", ), ], - artist_id: Some("UC74paQc9elYMxQKL8gpT1ow"), album_type: Single, year: None, by_va: false, @@ -4546,7 +4381,6 @@ expression: map_res.c name: "GARP", ), ], - artist_id: None, album_type: Single, year: None, by_va: false, @@ -4572,7 +4406,6 @@ expression: map_res.c name: "sanah", ), ], - artist_id: Some("UCV8SUfLumnpfd-Wa_i7B2Zw"), album_type: Album, year: None, by_va: false, @@ -4598,7 +4431,6 @@ expression: map_res.c name: "Our Last Night", ), ], - artist_id: Some("UCYW1nL0TZhQVLbS6KATqtig"), album_type: Album, year: None, by_va: false, @@ -4628,7 +4460,6 @@ expression: map_res.c name: "Pamela Jain", ), ], - artist_id: Some("UC13ToEQgfmTe8_GW19LYtCg"), album_type: Album, year: None, by_va: false, @@ -4654,7 +4485,6 @@ expression: map_res.c name: "BIBI", ), ], - artist_id: Some("UCWJKJhxr3a6P_z34eb7rmFw"), album_type: Album, year: None, by_va: false, @@ -4680,7 +4510,6 @@ expression: map_res.c name: "LUVRE47", ), ], - artist_id: Some("UCfjHG2KXoUrByv8MCSf6-LA"), album_type: Album, year: None, by_va: false, @@ -4706,7 +4535,6 @@ expression: map_res.c name: "Roberto Kabina", ), ], - artist_id: Some("UCy0W7pwUVNzrLVmIEKTkNSQ"), album_type: Album, year: None, by_va: false, @@ -4732,7 +4560,6 @@ expression: map_res.c name: "Dolly Parton", ), ], - artist_id: Some("UCXJscayh5BT8m2ZVFQSdeVw"), album_type: Album, year: None, by_va: false, @@ -4762,7 +4589,6 @@ expression: map_res.c name: "Johann Strauss Orchestra", ), ], - artist_id: Some("UCwEeCuFQo7gH6dcMeNnLg1A"), album_type: Album, year: None, by_va: false, @@ -4788,7 +4614,6 @@ expression: map_res.c name: "Nessa Barrett", ), ], - artist_id: Some("UCn81HiOrP7OO3SkdGvR6HPA"), album_type: Album, year: None, by_va: false, @@ -4814,7 +4639,6 @@ expression: map_res.c name: "Mr. Schnubs", ), ], - artist_id: Some("UCnL5ZocATjKZZ3IH_DXODkw"), album_type: Album, year: None, by_va: false, @@ -4840,7 +4664,6 @@ expression: map_res.c name: "Nej\'", ), ], - artist_id: Some("UCzB2BJ-eZel88EH4IUZATrA"), album_type: Album, year: None, by_va: false, @@ -4866,7 +4689,6 @@ expression: map_res.c name: "Annett Louisan", ), ], - artist_id: Some("UCFwFmMRTIVhsUtdudux_p4w"), album_type: Album, year: None, by_va: false, @@ -4892,7 +4714,6 @@ expression: map_res.c name: "Ella Fitzgerald", ), ], - artist_id: Some("UCuMHq8jMRZXpUxSGLBuCa9g"), album_type: Album, year: None, by_va: false, @@ -4918,7 +4739,6 @@ expression: map_res.c name: "Umut Capone", ), ], - artist_id: Some("UCNWORQud7YePhTxexu1qRFg"), album_type: Album, year: None, by_va: false, @@ -4944,7 +4764,6 @@ expression: map_res.c name: "AViVA", ), ], - artist_id: Some("UCighp0MtP4WdjnNJQtrTiJQ"), album_type: Album, year: None, by_va: false, @@ -4970,7 +4789,6 @@ expression: map_res.c name: "Iggy Pop", ), ], - artist_id: Some("UCN2OwEXNYJFzgHvR7912Btg"), album_type: Album, year: None, by_va: false, @@ -4996,7 +4814,6 @@ expression: map_res.c name: "kizaru", ), ], - artist_id: Some("UCLUW0Kr_w2nG0mv8q_qamxQ"), album_type: Album, year: None, by_va: false, @@ -5022,7 +4839,6 @@ expression: map_res.c name: "Marc Pircher", ), ], - artist_id: Some("UCfTUgzPRMoYWYjrwS5BgWfA"), album_type: Album, year: None, by_va: false, @@ -5048,7 +4864,6 @@ expression: map_res.c name: "King Khalil", ), ], - artist_id: Some("UCv83kiz_XGb4rfO0CXxzn5A"), album_type: Album, year: None, by_va: false, @@ -5074,7 +4889,6 @@ expression: map_res.c name: "Adam Kucho", ), ], - artist_id: Some("UCGknzG6-_Eh_jm_GcNkkYrQ"), album_type: Album, year: None, by_va: false, @@ -5100,7 +4914,6 @@ expression: map_res.c name: "SCH", ), ], - artist_id: Some("UCGyvS9Y1RU6CeTW78bltfjA"), album_type: Album, year: None, by_va: false, @@ -5138,7 +4951,6 @@ expression: map_res.c name: "Bharadwaj", ), ], - artist_id: Some("UCtJe0RYzgPddQXKtWduxz_w"), album_type: Album, year: None, by_va: false, @@ -5164,7 +4976,6 @@ expression: map_res.c name: "Полина Гагарина", ), ], - artist_id: Some("UCXNUMUQfREjoyzhxcXqpvGg"), album_type: Album, year: None, by_va: false, @@ -5190,7 +5001,6 @@ expression: map_res.c name: "Би-2", ), ], - artist_id: Some("UCAbByxN5lRm8SIkq3YYVuYQ"), album_type: Album, year: None, by_va: false, @@ -5216,7 +5026,6 @@ expression: map_res.c name: "YOASOBI", ), ], - artist_id: Some("UCI6B8NkZKqlFWoiC_xE-hzA"), album_type: Album, year: None, by_va: false, @@ -5242,7 +5051,6 @@ expression: map_res.c name: "Niska", ), ], - artist_id: Some("UC2ISePqOr39OQ90kNN1WLjA"), album_type: Album, year: None, by_va: false, @@ -5272,7 +5080,6 @@ expression: map_res.c name: "Alka Yagnik", ), ], - artist_id: Some("UCQd9dydn5gaib_uuVVkYZTQ"), album_type: Album, year: None, by_va: false, @@ -5298,7 +5105,6 @@ expression: map_res.c name: "Vinnie Paz", ), ], - artist_id: Some("UCbZKeXFPMh2lTPwOUDiHAAg"), album_type: Album, year: None, by_va: false, @@ -5324,7 +5130,6 @@ expression: map_res.c name: "The Real McKenzies", ), ], - artist_id: Some("UCZ_J_0XGC5hkOt7W3eEMVUQ"), album_type: Album, year: None, by_va: false, @@ -5350,7 +5155,6 @@ expression: map_res.c name: "Jean-Michel Jarre", ), ], - artist_id: Some("UCgZdvpUfbbUiqJ6UvAdM7EQ"), album_type: Album, year: None, by_va: false, @@ -5376,7 +5180,6 @@ expression: map_res.c name: "Merlin Ferez", ), ], - artist_id: Some("UCBhSdacVokJLmtqxH-TrIig"), album_type: Album, year: None, by_va: false, @@ -5402,7 +5205,6 @@ expression: map_res.c name: "Crvena Jabuka", ), ], - artist_id: Some("UCsNH8wD_AZXHnOlLKsV6KsQ"), album_type: Album, year: None, by_va: false, @@ -5428,7 +5230,6 @@ expression: map_res.c name: "Patti Canyoudothisin", ), ], - artist_id: Some("UCXbHzF6K7-9KnfT69_tdMSw"), album_type: Album, year: None, by_va: false, @@ -5454,7 +5255,6 @@ 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_description.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_description.snap index 0c069f1..19a4cd1 100644 --- a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_description.snap +++ b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_description.snap @@ -34,7 +34,6 @@ MusicAlbum( name: "Adele", ), ], - artist_id: Some("UCRw0x9_EfawqmgDI2IgQLLg"), description: Some("25 is the third studio album by English singer-songwriter Adele, released on 20 November 2015 by XL Recordings and Columbia Records. The album is titled as a reflection of her life and frame of mind at 25 years old and is termed a \"make-up record\". Its lyrical content features themes of Adele \"yearning for her old self, her nostalgia\", and \"melancholia about the passage of time\" according to an interview with the singer by Rolling Stone, as well as themes of motherhood and regret. In contrast to Adele\'s previous works, the production of 25 incorporated the use of electronic elements and creative rhythmic patterns, with elements of 1980s R&B and organs. Like when recording 21, Adele worked with producer and songwriter Paul Epworth and Ryan Tedder, along with new collaborations with Max Martin and Shellback, Bruno Mars, Greg Kurstin, Danger Mouse, the Smeezingtons, Samuel Dixon, and Tobias Jesso Jr.\n25 received generally positive reviews from music critics, who commended its production and Adele\'s vocal performance.\n\nFrom Wikipedia (https://en.wikipedia.org/wiki/25_(Adele_album)) under Creative Commons Attribution CC-BY-SA 3.0 (https://creativecommons.org/licenses/by-sa/3.0/legalcode)"), album_type: Album, year: Some(2015), 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 9ac04b0..d5da359 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 @@ -34,7 +34,6 @@ MusicAlbum( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), description: None, album_type: Album, year: Some(2016), @@ -423,7 +422,6 @@ 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_playlist__tests__map_music_album_single.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_single.snap index 5205b85..3e86ad8 100644 --- a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_single.snap +++ b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_single.snap @@ -38,7 +38,6 @@ MusicAlbum( name: "Vanessa Mai", ), ], - artist_id: Some("UCXGYZ-OhdOpPBamHX3K9YRg"), description: None, album_type: Single, year: Some(2020), diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_unavailable.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_unavailable.snap index 2393aab..5de9312 100644 --- a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_unavailable.snap +++ b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_unavailable.snap @@ -29,7 +29,6 @@ MusicAlbum( ), ], artists: [], - artist_id: None, description: None, album_type: Album, year: Some(2019), diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_various_artists.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_various_artists.snap index ba3766b..78bfbc7 100644 --- a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_various_artists.snap +++ b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_various_artists.snap @@ -29,7 +29,6 @@ MusicAlbum( ), ], artists: [], - artist_id: None, description: None, album_type: Single, year: Some(2022), 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 8478df1..3a76cac 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,7 +37,6 @@ MusicSearchFiltered( name: "aespa", ), ], - artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), album_type: Single, year: Some(2020), by_va: false, @@ -73,7 +72,6 @@ MusicSearchFiltered( name: "aespa", ), ], - artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), album_type: Album, year: Some(2022), by_va: false, @@ -109,7 +107,6 @@ MusicSearchFiltered( name: "Cojack", ), ], - artist_id: Some("UCZK5n7V2-iPHfUXLV2tDvzw"), album_type: Single, year: Some(2020), by_va: false, @@ -145,7 +142,6 @@ MusicSearchFiltered( name: "Montana Of 300", ), ], - artist_id: Some("UCudOYmRtW3uylYtqY1aAD0A"), album_type: Single, year: Some(2020), by_va: false, @@ -181,7 +177,6 @@ MusicSearchFiltered( name: "Alpha Wolf", ), ], - artist_id: Some("UC8whsREta_7Fu-EjRq2Ys-A"), album_type: Single, year: Some(2018), by_va: false, @@ -217,7 +212,6 @@ MusicSearchFiltered( name: "ESKIIMO", ), ], - artist_id: Some("UCRy7ecValgvorRe_8dum9lA"), album_type: Ep, year: Some(2022), by_va: false, @@ -253,7 +247,6 @@ MusicSearchFiltered( name: "Black Mamba Man", ), ], - artist_id: Some("UCdkNrc_l73BHYKRhDqxBo9w"), album_type: Album, year: Some(2017), by_va: false, @@ -289,7 +282,6 @@ MusicSearchFiltered( name: "Paride Saraceni", ), ], - artist_id: Some("UCn09cNujyKjEA1NxD5Aj_mQ"), album_type: Single, year: Some(2019), by_va: false, @@ -325,7 +317,6 @@ MusicSearchFiltered( name: "Addis Black Mamba", ), ], - artist_id: Some("UCYAFIwL4uBWQHBrBiohx1vw"), album_type: Single, year: Some(2019), by_va: false, @@ -369,7 +360,6 @@ MusicSearchFiltered( name: "24.Gz", ), ], - artist_id: Some("UCs04jfHH78YUziFA52P97LA"), album_type: Single, year: Some(2022), by_va: false, @@ -405,7 +395,6 @@ MusicSearchFiltered( name: "Seoul Philharmonic Orchestra", ), ], - artist_id: Some("UCZwE-b-kzA4pQaCQXwOQnlg"), album_type: Single, year: Some(2022), by_va: false, @@ -441,7 +430,6 @@ MusicSearchFiltered( name: "Hever Jara", ), ], - artist_id: Some("UC_SI7sOel-qMTvSe-lGHX8w"), album_type: Single, year: Some(2018), by_va: false, @@ -477,7 +465,6 @@ MusicSearchFiltered( name: "Yung FN", ), ], - artist_id: Some("UCMZowOoC3u_ntr9o52ekeZw"), album_type: Single, year: Some(2022), by_va: false, @@ -513,7 +500,6 @@ MusicSearchFiltered( name: "Hobino", ), ], - artist_id: Some("UCX6v_euBwliDYV2NMTouuSA"), album_type: Single, year: Some(2022), by_va: false, @@ -549,7 +535,6 @@ MusicSearchFiltered( name: "Tee See Connection", ), ], - artist_id: Some("UCAlOD5s3Ro27M61-2Z_UB7w"), album_type: Single, year: Some(2013), by_va: false, @@ -585,7 +570,6 @@ MusicSearchFiltered( name: "Franco Vitola", ), ], - artist_id: Some("UC77rFNJxH8Y2VwSYp8ZTXHA"), album_type: Single, year: Some(2020), by_va: false, @@ -621,7 +605,6 @@ MusicSearchFiltered( name: "Black Mamba", ), ], - artist_id: Some("UCxX9tNcQgCBuU56ezupriqg"), album_type: Album, year: Some(2011), by_va: false, @@ -657,7 +640,6 @@ MusicSearchFiltered( name: "WookTheCrook", ), ], - artist_id: Some("UC6Y8G45J9Uv2EsLLOatymOw"), album_type: Single, year: Some(2022), by_va: false, @@ -693,7 +675,6 @@ MusicSearchFiltered( name: "The Black Mamba", ), ], - artist_id: Some("UCaDT20-B3U8h-tPg_VMvntw"), album_type: Album, year: Some(2012), by_va: false, @@ -729,7 +710,6 @@ 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 984a538..3497bee 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,7 +226,6 @@ MusicSearchResult( name: "aespa", ), ], - artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), album_type: Single, year: Some(2020), by_va: false, @@ -262,7 +261,6 @@ MusicSearchResult( name: "aespa", ), ], - artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), album_type: Album, year: Some(2022), by_va: false, @@ -298,7 +296,6 @@ 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 9c0f4ac..1179b97 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,7 +194,6 @@ MusicSearchResult( ), ], artists: [], - artist_id: None, album_type: Album, year: Some(2016), by_va: true, @@ -225,7 +224,6 @@ MusicSearchResult( ), ], artists: [], - artist_id: None, album_type: Album, year: Some(2022), by_va: true, @@ -261,7 +259,6 @@ 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 4170f18..5d39ef8 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,7 +199,6 @@ MusicSearchResult( name: "Namika", ), ], - artist_id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), album_type: Single, year: Some(2015), by_va: false, @@ -235,7 +234,6 @@ MusicSearchResult( name: "Namika", ), ], - artist_id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), album_type: Ep, year: Some(2015), by_va: false, @@ -271,7 +269,6 @@ MusicSearchResult( name: "Boris Brejcha", ), ], - artist_id: Some("UCCpID8TTjkkjLCwBybAfHSg"), album_type: Single, year: Some(2019), by_va: false, @@ -307,7 +304,6 @@ 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 3d6c80f..b72a023 100644 --- a/src/model/mod.rs +++ b/src/model/mod.rs @@ -1039,8 +1039,6 @@ 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 @@ -1134,8 +1132,6 @@ pub struct MusicAlbum { pub cover: Vec, /// Artists of the album pub artists: Vec, - /// Primary artist ID - pub artist_id: Option, /// Album description in plaintext format pub description: Option, /// Album type (Album/Single/EP) diff --git a/tests/snapshots/youtube__music_album_audiobook.snap b/tests/snapshots/youtube__music_album_audiobook.snap index a9453a6..8c07788 100644 --- a/tests/snapshots/youtube__music_album_audiobook.snap +++ b/tests/snapshots/youtube__music_album_audiobook.snap @@ -10,10 +10,13 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], - artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), description: None, album_type: Audiobook, year: Some(2022), @@ -27,7 +30,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -47,7 +54,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -67,7 +78,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -87,7 +102,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -107,7 +126,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -127,7 +150,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -147,7 +174,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -167,7 +198,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -187,7 +222,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -207,7 +246,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -227,7 +270,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -247,7 +294,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -267,7 +318,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -287,7 +342,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -307,7 +366,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -327,7 +390,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -347,7 +414,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -367,7 +438,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -387,7 +462,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -407,7 +486,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -427,7 +510,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -447,7 +534,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -467,7 +558,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -487,7 +582,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -507,7 +606,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -527,7 +630,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -547,7 +654,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -567,7 +678,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -587,7 +702,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -607,7 +726,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -627,7 +750,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -647,7 +774,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -667,7 +798,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -687,7 +822,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -707,7 +846,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -727,7 +870,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -747,7 +894,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -767,7 +918,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -787,7 +942,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -807,7 +966,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -827,7 +990,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -847,7 +1014,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -867,7 +1038,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -887,7 +1062,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -907,7 +1086,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -927,7 +1110,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -947,7 +1134,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -967,7 +1158,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -987,7 +1182,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1007,7 +1206,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1027,7 +1230,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1047,7 +1254,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1067,7 +1278,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1087,7 +1302,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1107,7 +1326,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1127,7 +1350,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1147,7 +1374,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1167,7 +1398,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1187,7 +1422,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1207,7 +1446,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1227,7 +1470,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1247,7 +1494,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1267,7 +1518,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1287,7 +1542,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1307,7 +1566,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1327,7 +1590,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1347,7 +1614,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1367,7 +1638,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1387,7 +1662,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1407,7 +1686,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1427,7 +1710,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1447,7 +1734,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1467,7 +1758,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1487,7 +1782,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1507,7 +1806,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1527,7 +1830,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1547,7 +1854,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1567,7 +1878,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1587,7 +1902,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1607,7 +1926,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1627,7 +1950,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1647,7 +1974,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1667,7 +1998,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1687,7 +2022,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1707,7 +2046,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1727,7 +2070,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1747,7 +2094,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1767,7 +2118,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1787,7 +2142,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1807,7 +2166,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1827,7 +2190,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1847,7 +2214,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1867,7 +2238,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1887,7 +2262,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1907,7 +2286,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1927,7 +2310,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1947,7 +2334,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1967,7 +2358,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -1987,7 +2382,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2007,7 +2406,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2027,7 +2430,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2047,7 +2454,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2067,7 +2478,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2087,7 +2502,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2107,7 +2526,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2127,7 +2550,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2147,7 +2574,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2167,7 +2598,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2187,7 +2622,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2207,7 +2646,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2227,7 +2670,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2247,7 +2694,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2267,7 +2718,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2287,7 +2742,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2307,7 +2766,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2327,7 +2790,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2347,7 +2814,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2367,7 +2838,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2387,7 +2862,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2407,7 +2886,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2427,7 +2910,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2447,7 +2934,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2467,7 +2958,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2487,7 +2982,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2507,7 +3006,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2527,7 +3030,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2547,7 +3054,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2567,7 +3078,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2587,7 +3102,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2607,7 +3126,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2627,7 +3150,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2647,7 +3174,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2667,7 +3198,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2687,7 +3222,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2707,7 +3246,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2727,7 +3270,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2747,7 +3294,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2767,7 +3318,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2787,7 +3342,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2807,7 +3366,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2827,7 +3390,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2847,7 +3414,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2867,7 +3438,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2887,7 +3462,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2907,7 +3486,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2927,7 +3510,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2947,7 +3534,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2967,7 +3558,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -2987,7 +3582,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3007,7 +3606,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3027,7 +3630,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3047,7 +3654,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3067,7 +3678,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3087,7 +3702,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3107,7 +3726,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3127,7 +3750,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3147,7 +3774,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3167,7 +3798,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3187,7 +3822,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3207,7 +3846,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3227,7 +3870,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3247,7 +3894,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3267,7 +3918,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3287,7 +3942,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3307,7 +3966,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3327,7 +3990,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3347,7 +4014,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3367,7 +4038,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3387,7 +4062,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3407,7 +4086,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3427,7 +4110,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3447,7 +4134,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3467,7 +4158,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3487,7 +4182,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3507,7 +4206,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3527,7 +4230,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3547,7 +4254,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3567,7 +4278,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3587,7 +4302,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3607,7 +4326,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3627,7 +4350,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3647,7 +4374,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3667,7 +4398,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3687,7 +4422,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3707,7 +4446,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3727,7 +4470,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3747,7 +4494,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3767,7 +4518,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3787,7 +4542,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3807,7 +4566,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3827,7 +4590,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3847,7 +4614,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3867,7 +4638,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3887,7 +4662,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3907,7 +4686,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3927,7 +4710,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3947,7 +4734,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3967,7 +4758,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -3987,7 +4782,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), @@ -4007,7 +4806,11 @@ MusicAlbum( artists: [ ArtistId( id: None, - name: "George Orwell & Dirk Jacobs", + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", ), ], artist_id: Some("UCTlkMP4GiGuhOiBdcmI65kg"), diff --git a/tests/snapshots/youtube__music_artist_basic.snap b/tests/snapshots/youtube__music_album_basic.snap similarity index 87% rename from tests/snapshots/youtube__music_artist_basic.snap rename to tests/snapshots/youtube__music_album_basic.snap index c4e32f7..03e18aa 100644 --- a/tests/snapshots/youtube__music_artist_basic.snap +++ b/tests/snapshots/youtube__music_album_basic.snap @@ -21,7 +21,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2010), by_va: false, @@ -36,7 +35,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2014), by_va: false, @@ -51,7 +49,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2008), by_va: false, @@ -66,7 +63,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2012), by_va: false, @@ -81,7 +77,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2021), by_va: false, @@ -96,7 +91,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2018), by_va: false, @@ -111,7 +105,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2014), by_va: false, @@ -126,7 +119,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2006), by_va: false, @@ -141,7 +133,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2016), by_va: false, @@ -156,7 +147,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2017), by_va: false, @@ -171,7 +161,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2017), by_va: false, @@ -186,7 +175,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2008), by_va: false, @@ -201,7 +189,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2021), by_va: false, @@ -216,7 +203,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2006), by_va: false, @@ -231,7 +217,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2015), by_va: false, @@ -246,7 +231,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2015), by_va: false, @@ -261,7 +245,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2014), by_va: false, @@ -276,7 +259,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2010), by_va: false, @@ -291,7 +273,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2014), by_va: false, @@ -306,7 +287,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2008), by_va: false, diff --git a/tests/snapshots/youtube__music_artist_basic_all.snap b/tests/snapshots/youtube__music_album_basic_all.snap similarity index 86% rename from tests/snapshots/youtube__music_artist_basic_all.snap rename to tests/snapshots/youtube__music_album_basic_all.snap index d8a72ed..939edde 100644 --- a/tests/snapshots/youtube__music_artist_basic_all.snap +++ b/tests/snapshots/youtube__music_album_basic_all.snap @@ -21,7 +21,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2010), by_va: false, @@ -36,7 +35,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2014), by_va: false, @@ -51,7 +49,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2008), by_va: false, @@ -66,7 +63,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2012), by_va: false, @@ -81,7 +77,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2012), by_va: false, @@ -96,7 +91,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2015), by_va: false, @@ -111,7 +105,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2015), by_va: false, @@ -126,7 +119,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2012), by_va: false, @@ -141,7 +133,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2004), by_va: false, @@ -156,7 +147,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2021), by_va: false, @@ -171,7 +161,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2018), by_va: false, @@ -186,7 +175,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2003), by_va: false, @@ -201,7 +189,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2012), by_va: false, @@ -216,7 +203,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2014), by_va: false, @@ -231,7 +217,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2006), by_va: false, @@ -246,7 +231,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2000), by_va: false, @@ -261,7 +245,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2016), by_va: false, @@ -276,7 +259,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2017), by_va: false, @@ -291,7 +273,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2012), by_va: false, @@ -306,7 +287,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2017), by_va: false, @@ -321,7 +301,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2008), by_va: false, @@ -336,7 +315,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2021), by_va: false, @@ -351,7 +329,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2021), by_va: false, @@ -366,7 +343,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2003), by_va: false, @@ -381,7 +357,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2010), by_va: false, @@ -396,7 +371,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2006), by_va: false, @@ -411,7 +385,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2010), by_va: false, @@ -426,7 +399,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2015), by_va: false, @@ -441,7 +413,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2002), by_va: false, @@ -456,7 +427,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2015), by_va: false, @@ -471,7 +441,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2004), by_va: false, @@ -486,7 +455,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2014), by_va: false, @@ -501,7 +469,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2003), by_va: false, @@ -516,7 +483,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2007), by_va: false, @@ -531,7 +497,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Ep, year: Some(2010), by_va: false, @@ -546,7 +511,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2012), by_va: false, @@ -561,7 +525,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2014), by_va: false, @@ -576,7 +539,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2010), by_va: false, @@ -591,7 +553,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2008), by_va: false, @@ -606,7 +567,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2010), by_va: false, @@ -621,7 +581,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Album, year: Some(2008), by_va: false, @@ -636,7 +595,6 @@ MusicArtist( name: "Unheilig", ), ], - artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"), album_type: Single, year: Some(2010), by_va: false, @@ -651,7 +609,6 @@ 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_ep.snap b/tests/snapshots/youtube__music_album_ep.snap index 3c30274..26256f6 100644 --- a/tests/snapshots/youtube__music_album_ep.snap +++ b/tests/snapshots/youtube__music_album_ep.snap @@ -13,7 +13,6 @@ MusicAlbum( name: "Madeline Juno", ), ], - artist_id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"), description: None, album_type: Ep, year: Some(2016), diff --git a/tests/snapshots/youtube__music_artist_no_artist.snap b/tests/snapshots/youtube__music_album_no_artist.snap similarity index 100% rename from tests/snapshots/youtube__music_artist_no_artist.snap rename to tests/snapshots/youtube__music_album_no_artist.snap diff --git a/tests/snapshots/youtube__music_artist_no_more_albums.snap b/tests/snapshots/youtube__music_album_no_more_albums.snap similarity index 88% rename from tests/snapshots/youtube__music_artist_no_more_albums.snap rename to tests/snapshots/youtube__music_album_no_more_albums.snap index b872403..eb24800 100644 --- a/tests/snapshots/youtube__music_artist_no_more_albums.snap +++ b/tests/snapshots/youtube__music_album_no_more_albums.snap @@ -21,7 +21,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2016), by_va: false, @@ -36,7 +35,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2014), by_va: false, @@ -51,7 +49,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2014), by_va: false, @@ -66,7 +63,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2007), by_va: false, @@ -81,7 +77,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2020), by_va: false, @@ -96,7 +91,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2017), by_va: false, @@ -111,7 +105,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2017), by_va: false, @@ -126,7 +119,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2020), by_va: false, @@ -141,7 +133,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2016), by_va: false, @@ -156,7 +147,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2015), by_va: false, @@ -171,7 +161,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2019), by_va: false, @@ -186,7 +175,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2006), by_va: false, @@ -201,7 +189,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: Some(2016), by_va: false, @@ -216,7 +203,6 @@ MusicArtist( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Single, year: Some(2019), by_va: false, @@ -231,7 +217,6 @@ 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 0346d4a..209cb44 100644 --- a/tests/snapshots/youtube__music_album_one_artist.snap +++ b/tests/snapshots/youtube__music_album_one_artist.snap @@ -13,7 +13,6 @@ MusicAlbum( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), description: None, album_type: Album, year: Some(2016), @@ -402,7 +401,6 @@ MusicAlbum( name: "Oonagh", ), ], - artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), album_type: Album, year: None, by_va: false, diff --git a/tests/snapshots/youtube__music_artist_only_singles.snap b/tests/snapshots/youtube__music_album_only_singles.snap similarity index 97% rename from tests/snapshots/youtube__music_artist_only_singles.snap rename to tests/snapshots/youtube__music_album_only_singles.snap index 4e56735..16f0814 100644 --- a/tests/snapshots/youtube__music_artist_only_singles.snap +++ b/tests/snapshots/youtube__music_album_only_singles.snap @@ -21,7 +21,6 @@ MusicArtist( name: "Sulli", ), ], - artist_id: Some("UCfwCE5VhPMGxNPFxtVv7lRw"), album_type: Single, year: Some(2019), by_va: false, diff --git a/tests/snapshots/youtube__music_album_show.snap b/tests/snapshots/youtube__music_album_show.snap index 3f1d426..96501ec 100644 --- a/tests/snapshots/youtube__music_album_show.snap +++ b/tests/snapshots/youtube__music_album_show.snap @@ -13,7 +13,6 @@ MusicAlbum( name: "Kingdom Force", ), ], - artist_id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), description: None, album_type: Show, year: Some(2022), diff --git a/tests/snapshots/youtube__music_album_single.snap b/tests/snapshots/youtube__music_album_single.snap index 9d006f6..aeba890 100644 --- a/tests/snapshots/youtube__music_album_single.snap +++ b/tests/snapshots/youtube__music_album_single.snap @@ -17,7 +17,6 @@ MusicAlbum( name: "Vanessa Mai", ), ], - artist_id: Some("UCXGYZ-OhdOpPBamHX3K9YRg"), description: None, album_type: Single, year: Some(2020), diff --git a/tests/snapshots/youtube__music_album_unavailable.snap b/tests/snapshots/youtube__music_album_unavailable.snap index 6bd5a2f..29c48a9 100644 --- a/tests/snapshots/youtube__music_album_unavailable.snap +++ b/tests/snapshots/youtube__music_album_unavailable.snap @@ -8,7 +8,6 @@ MusicAlbum( name: "13 Reasons Why (Season 3)", cover: "[cover]", artists: [], - artist_id: None, description: None, album_type: Album, year: Some(2019), diff --git a/tests/snapshots/youtube__music_album_various_artists.snap b/tests/snapshots/youtube__music_album_various_artists.snap index c75a44a..b04f5ea 100644 --- a/tests/snapshots/youtube__music_album_various_artists.snap +++ b/tests/snapshots/youtube__music_album_various_artists.snap @@ -8,7 +8,6 @@ MusicAlbum( name: "＜Queendom2＞ FINAL", cover: "[cover]", artists: [], - artist_id: None, description: None, album_type: Single, year: Some(2022), diff --git a/tests/youtube.rs b/tests/youtube.rs index 8462b77..6cef49f 100644 --- a/tests/youtube.rs +++ b/tests/youtube.rs @@ -1447,7 +1447,7 @@ async fn music_artist( // Sort albums to ensure consistent order artist.albums.sort_by_key(|a| a.id.to_owned()); - insta::assert_ron_snapshot!(format!("music_artist_{}", name), artist, { + insta::assert_ron_snapshot!(format!("music_album_{}", name), artist, { ".header_image" => "[header_image]", ".subscriber_count" => "[subscriber_count]", ".albums[].cover" => "[cover]", @@ -1662,7 +1662,6 @@ 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);