tests: fix artist snapshot naming

src/client/music_playlist.rs

@@ -10,7 +10,7 @@ use crate::{
 use super::{
     response::{
         self,
-        music_item::{map_album_type, map_artists, MusicListMapper},
+        music_item::{map_album_type, map_artist_id, map_artists, MusicListMapper},
     },
     ClientType, MapResponse, QBrowse, RustyPipeQuery,
 };
@@ -274,18 +274,6 @@ impl MapResponse<MusicAlbum> 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());
 
@@ -299,6 +287,25 @@ impl MapResponse<MusicAlbum> 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(),
@@ -326,6 +333,7 @@ impl MapResponse<MusicAlbum> for response::MusicPlaylist {
                 name: header.title,
                 cover: header.thumbnail.into(),
                 artists,
+                artist_id,
                 description: header.description,
                 album_type,
                 year,

src/client/response/music_item.rs

@@ -620,7 +620,7 @@ impl MusicListMapper {
                         }
 
                         // Extract artist id from dropdown menu
-                        let artist_id = map_artist_id(item.menu, artists.first());
+                        let artist_id = map_artist_id_fallback(item.menu, artists.first());
 
                         let track_nr = item.index.and_then(|txt| util::parse_numeric(&txt).ok());
 
@@ -675,6 +675,8 @@ impl MusicListMapper {
 
                                 let (artists, by_va) = map_artists(subtitle_p2);
 
+                                let artist_id = map_artist_id_fallback(item.menu, artists.first());
+
                                 let year = subtitle_p3
                                     .and_then(|st| util::parse_numeric(st.first_str()).ok());
 
@@ -683,6 +685,7 @@ impl MusicListMapper {
                                     name: title,
                                     cover: item.thumbnail.into(),
                                     artists,
+                                    artist_id,
                                     album_type,
                                     year,
                                     by_va,
@@ -809,6 +812,7 @@ impl MusicListMapper {
                                 id,
                                 name: item.title,
                                 cover: item.thumbnail_renderer.into(),
+                                artist_id: artists.first().and_then(|a| a.id.to_owned()),
                                 artists,
                                 album_type,
                                 year,
@@ -946,29 +950,31 @@ pub(crate) fn map_artists(artists_p: Option<TextComponents>) -> (Vec<ArtistId>,
     (artists, by_va)
 }
 
-pub(crate) fn map_artist_id(
+fn map_artist_id_fallback(
     menu: Option<MusicItemMenu>,
     fallback_artist: Option<&ArtistId>,
 ) -> Option<String> {
-    menu.and_then(|m| {
+    menu.and_then(|m| map_artist_id(m.menu_renderer.items))
-        m.menu_renderer.items.into_iter().find_map(|i| {
+        .or_else(|| fallback_artist.and_then(|a| a.id.to_owned()))
-            let ep = i
+}
-                .menu_navigation_item_renderer
+
-                .navigation_endpoint
+pub(crate) fn map_artist_id(entries: Vec<MusicItemMenuEntry>) -> Option<String> {
-                .browse_endpoint;
+    entries.into_iter().find_map(|i| {
-            ep.and_then(|ep| {
+        let ep = i
-                ep.browse_endpoint_context_supported_configs
+            .menu_navigation_item_renderer
-                    .and_then(|cfg| {
+            .navigation_endpoint
-                        if cfg.browse_endpoint_context_music_config.page_type == PageType::Artist {
+            .browse_endpoint;
-                            Some(ep.browse_id)
+        ep.and_then(|ep| {
-                        } else {
+            ep.browse_endpoint_context_supported_configs
-                            None
+                .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 {
@@ -991,7 +997,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(item.menu, artists.first());
+    let artist_id = map_artist_id_fallback(item.menu, artists.first());
 
     let subtitle_p2 = subtitle_parts.next();
     let (album, view_count) = if is_video {

src/client/response/music_playlist.rs

@@ -5,7 +5,8 @@ use crate::serializer::text::{Text, TextComponents};
 
 use super::{
     music_item::{
-        ItemSection, MusicContentsRenderer, MusicThumbnailRenderer, SingleColumnBrowseResult,
+        ItemSection, MusicContentsRenderer, MusicItemMenuEntry, MusicThumbnailRenderer,
+        SingleColumnBrowseResult,
     },
     Tab,
 };
@@ -78,6 +79,8 @@ pub(crate) struct HeaderMenuRenderer {
     #[serde(default)]
     #[serde_as(as = "VecSkipError<_>")]
     pub top_level_buttons: Vec<TopLevelButton>,
+    #[serde_as(as = "VecSkipError<_>")]
+    pub items: Vec<MusicItemMenuEntry>,
 }
 
 #[derive(Debug, Deserialize)]

src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_default.snap

@@ -506,6 +506,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2021),
       by_va: false,
@@ -531,6 +532,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2019),
       by_va: false,
@@ -556,6 +558,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2017),
       by_va: false,
@@ -581,6 +584,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Ep,
       year: Some(2014),
       by_va: false,
@@ -606,6 +610,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2014),
       by_va: false,
@@ -631,6 +636,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2011),
       by_va: false,
@@ -656,6 +662,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2011),
       by_va: false,
@@ -681,6 +688,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Ep,
       year: Some(2010),
       by_va: false,
@@ -706,6 +714,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2010),
       by_va: false,
@@ -731,6 +740,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Ep,
       year: Some(2009),
       by_va: false,
@@ -756,6 +766,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2022),
       by_va: false,
@@ -781,6 +792,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Ep,
       year: Some(2021),
       by_va: false,
@@ -806,6 +818,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Ep,
       year: Some(2011),
       by_va: false,
@@ -831,6 +844,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2015),
       by_va: false,
@@ -856,6 +870,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Ep,
       year: Some(2010),
       by_va: false,
@@ -881,6 +896,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -906,6 +922,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -931,6 +948,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -956,6 +974,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -981,6 +1000,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1006,6 +1026,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1031,6 +1052,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1056,6 +1078,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1081,6 +1104,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1106,6 +1130,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1131,6 +1156,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1156,6 +1182,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1181,6 +1208,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1206,6 +1234,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1231,6 +1260,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1256,6 +1286,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1281,6 +1312,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1306,6 +1338,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1331,6 +1364,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1356,6 +1390,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1381,6 +1416,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1406,6 +1442,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1431,6 +1468,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1456,6 +1494,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1481,6 +1520,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -1506,6 +1546,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1531,6 +1572,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1556,6 +1598,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1581,6 +1624,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1606,6 +1650,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1631,6 +1676,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1656,6 +1702,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1681,6 +1728,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1706,6 +1754,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1731,6 +1780,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1756,6 +1806,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1781,6 +1832,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1806,6 +1858,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1831,6 +1884,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1856,6 +1910,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1881,6 +1936,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1906,6 +1962,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1931,6 +1988,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1956,6 +2014,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -1981,6 +2040,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -2006,6 +2066,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2020),
       by_va: false,
@@ -2031,6 +2092,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2020),
       by_va: false,
@@ -2056,6 +2118,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2081,6 +2144,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2106,6 +2170,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2131,6 +2196,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2156,6 +2222,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2181,6 +2248,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2206,6 +2274,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2231,6 +2300,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2256,6 +2326,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2281,6 +2352,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2306,6 +2378,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2331,6 +2404,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2356,6 +2430,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2381,6 +2456,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2406,6 +2482,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2431,6 +2508,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2456,6 +2534,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2481,6 +2560,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2506,6 +2586,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2531,6 +2612,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -2556,6 +2638,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2018),
       by_va: false,
@@ -2581,6 +2664,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2018),
       by_va: false,
@@ -2606,6 +2690,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2018),
       by_va: false,
@@ -2631,6 +2716,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2018),
       by_va: false,
@@ -2656,6 +2742,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2681,6 +2768,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2706,6 +2794,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2731,6 +2820,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2756,6 +2846,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2781,6 +2872,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2806,6 +2898,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2831,6 +2924,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2856,6 +2950,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2881,6 +2976,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2906,6 +3002,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2931,6 +3028,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2956,6 +3054,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -2981,6 +3080,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -3006,6 +3106,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -3031,6 +3132,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -3056,6 +3158,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -3081,6 +3184,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -3106,6 +3210,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -3131,6 +3236,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -3156,6 +3262,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2011),
       by_va: false,

src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_cont.snap

@@ -506,6 +506,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2021),
       by_va: false,
@@ -531,6 +532,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2019),
       by_va: false,
@@ -556,6 +558,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2017),
       by_va: false,
@@ -581,6 +584,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Ep,
       year: Some(2014),
       by_va: false,
@@ -606,6 +610,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2014),
       by_va: false,
@@ -631,6 +636,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2011),
       by_va: false,
@@ -656,6 +662,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2011),
       by_va: false,
@@ -681,6 +688,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Ep,
       year: Some(2010),
       by_va: false,
@@ -706,6 +714,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Album,
       year: Some(2010),
       by_va: false,
@@ -731,6 +740,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Ep,
       year: Some(2009),
       by_va: false,
@@ -756,6 +766,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -781,6 +792,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -806,6 +818,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -831,6 +844,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -856,6 +870,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -881,6 +896,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -906,6 +922,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -931,6 +948,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -956,6 +974,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -981,6 +1000,7 @@ MusicArtist(
           name: "Ed Sheeran",
         ),
       ],
+      artist_id: Some("UClmXPfaYhXOYsNn_QUyheWQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,

src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_more_albums.snap

@@ -409,6 +409,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Album,
       year: Some(2019),
       by_va: false,
@@ -434,6 +435,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Album,
       year: Some(2016),
       by_va: false,
@@ -459,6 +461,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Album,
       year: Some(2015),
       by_va: false,
@@ -484,6 +487,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Album,
       year: Some(2014),
       by_va: false,
@@ -509,6 +513,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Album,
       year: Some(2020),
       by_va: false,
@@ -534,6 +539,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2020),
       by_va: false,
@@ -559,6 +565,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -584,6 +591,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -609,6 +617,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -634,6 +643,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2016),
       by_va: false,
@@ -659,6 +669,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2016),
       by_va: false,
@@ -684,6 +695,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -709,6 +721,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -734,6 +747,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2007),
       by_va: false,
@@ -759,6 +773,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2006),
       by_va: false,

src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_only_more_singles.snap

@@ -510,6 +510,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Album,
       year: Some(2022),
       by_va: false,
@@ -535,6 +536,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Album,
       year: Some(2022),
       by_va: false,
@@ -560,6 +562,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Album,
       year: Some(2018),
       by_va: false,
@@ -585,6 +588,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Album,
       year: Some(2017),
       by_va: false,
@@ -610,6 +614,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Album,
       year: Some(2014),
       by_va: false,
@@ -635,6 +640,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Album,
       year: Some(2011),
       by_va: false,
@@ -660,6 +666,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Ep,
       year: Some(2010),
       by_va: false,
@@ -685,6 +692,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Ep,
       year: Some(2009),
       by_va: false,
@@ -710,6 +718,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Ep,
       year: Some(2017),
       by_va: false,
@@ -735,6 +744,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -760,6 +770,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -785,6 +796,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -810,6 +822,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2022),
       by_va: false,
@@ -835,6 +848,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -860,6 +874,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -885,6 +900,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -910,6 +926,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -935,6 +952,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -960,6 +978,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -985,6 +1004,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -1010,6 +1030,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2018),
       by_va: false,
@@ -1035,6 +1056,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2018),
       by_va: false,
@@ -1060,6 +1082,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2018),
       by_va: false,
@@ -1085,6 +1108,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -1110,6 +1134,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -1135,6 +1160,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -1160,6 +1186,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -1185,6 +1212,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -1210,6 +1238,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2016),
       by_va: false,
@@ -1235,6 +1264,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2016),
       by_va: false,
@@ -1260,6 +1290,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2015),
       by_va: false,
@@ -1285,6 +1316,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2015),
       by_va: false,
@@ -1310,6 +1342,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2015),
       by_va: false,
@@ -1335,6 +1368,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2015),
       by_va: false,
@@ -1360,6 +1394,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2015),
       by_va: false,
@@ -1385,6 +1420,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -1410,6 +1446,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -1435,6 +1472,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -1460,6 +1498,7 @@ MusicArtist(
           name: "Imagine Dragons",
         ),
       ],
+      artist_id: Some("UC0aXrjVxG5pZr99v77wZdPQ"),
       album_type: Single,
       year: Some(2013),
       by_va: false,

src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_only_singles.snap

@@ -432,6 +432,7 @@ MusicArtist(
           name: "Sulli",
         ),
       ],
+      artist_id: Some("UCfwCE5VhPMGxNPFxtVv7lRw"),
       album_type: Single,
       year: Some(2019),
       by_va: false,

src/client/snapshots/rustypipe__client__music_details__tests__map_music_related.snap

@@ -741,6 +741,7 @@ MusicRelated(
           name: "aespa",
         ),
       ],
+      artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"),
       album_type: Album,
       year: Some(2022),
       by_va: false,
@@ -766,6 +767,7 @@ MusicRelated(
           name: "aespa",
         ),
       ],
+      artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"),
       album_type: Ep,
       year: Some(2021),
       by_va: false,

src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_description.snap

@@ -34,6 +34,7 @@ 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),

src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_one_artist.snap

@@ -34,6 +34,7 @@ MusicAlbum(
       name: "Oonagh",
     ),
   ],
+  artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
   description: None,
   album_type: Album,
   year: Some(2016),
@@ -422,6 +423,7 @@ MusicAlbum(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Album,
       year: None,
       by_va: false,

src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_single.snap

@@ -38,6 +38,7 @@ MusicAlbum(
       name: "Vanessa Mai",
     ),
   ],
+  artist_id: Some("UCXGYZ-OhdOpPBamHX3K9YRg"),
   description: None,
   album_type: Single,
   year: Some(2020),

src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_unavailable.snap

@@ -29,6 +29,7 @@ MusicAlbum(
     ),
   ],
   artists: [],
+  artist_id: None,
   description: None,
   album_type: Album,
   year: Some(2019),

src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_various_artists.snap

@@ -29,6 +29,7 @@ MusicAlbum(
     ),
   ],
   artists: [],
+  artist_id: None,
   description: None,
   album_type: Single,
   year: Some(2022),

src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_albums.snap

@@ -37,6 +37,7 @@ MusicSearchFiltered(
             name: "aespa",
           ),
         ],
+        artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"),
         album_type: Single,
         year: Some(2020),
         by_va: false,
@@ -72,6 +73,7 @@ MusicSearchFiltered(
             name: "aespa",
           ),
         ],
+        artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"),
         album_type: Album,
         year: Some(2022),
         by_va: false,
@@ -107,6 +109,7 @@ MusicSearchFiltered(
             name: "Cojack",
           ),
         ],
+        artist_id: Some("UCZK5n7V2-iPHfUXLV2tDvzw"),
         album_type: Single,
         year: Some(2020),
         by_va: false,
@@ -142,6 +145,7 @@ MusicSearchFiltered(
             name: "Montana Of 300",
           ),
         ],
+        artist_id: Some("UCudOYmRtW3uylYtqY1aAD0A"),
         album_type: Single,
         year: Some(2020),
         by_va: false,
@@ -177,6 +181,7 @@ MusicSearchFiltered(
             name: "Alpha Wolf",
           ),
         ],
+        artist_id: Some("UC8whsREta_7Fu-EjRq2Ys-A"),
         album_type: Single,
         year: Some(2018),
         by_va: false,
@@ -212,6 +217,7 @@ MusicSearchFiltered(
             name: "ESKIIMO",
           ),
         ],
+        artist_id: Some("UCRy7ecValgvorRe_8dum9lA"),
         album_type: Ep,
         year: Some(2022),
         by_va: false,
@@ -247,6 +253,7 @@ MusicSearchFiltered(
             name: "Black Mamba Man",
           ),
         ],
+        artist_id: Some("UCdkNrc_l73BHYKRhDqxBo9w"),
         album_type: Album,
         year: Some(2017),
         by_va: false,
@@ -282,6 +289,7 @@ MusicSearchFiltered(
             name: "Paride Saraceni",
           ),
         ],
+        artist_id: Some("UCn09cNujyKjEA1NxD5Aj_mQ"),
         album_type: Single,
         year: Some(2019),
         by_va: false,
@@ -317,6 +325,7 @@ MusicSearchFiltered(
             name: "Addis Black Mamba",
           ),
         ],
+        artist_id: Some("UCYAFIwL4uBWQHBrBiohx1vw"),
         album_type: Single,
         year: Some(2019),
         by_va: false,
@@ -360,6 +369,7 @@ MusicSearchFiltered(
             name: "24.Gz",
           ),
         ],
+        artist_id: Some("UCs04jfHH78YUziFA52P97LA"),
         album_type: Single,
         year: Some(2022),
         by_va: false,
@@ -395,6 +405,7 @@ MusicSearchFiltered(
             name: "Seoul Philharmonic Orchestra",
           ),
         ],
+        artist_id: Some("UCZwE-b-kzA4pQaCQXwOQnlg"),
         album_type: Single,
         year: Some(2022),
         by_va: false,
@@ -430,6 +441,7 @@ MusicSearchFiltered(
             name: "Hever Jara",
           ),
         ],
+        artist_id: Some("UC_SI7sOel-qMTvSe-lGHX8w"),
         album_type: Single,
         year: Some(2018),
         by_va: false,
@@ -465,6 +477,7 @@ MusicSearchFiltered(
             name: "Yung FN",
           ),
         ],
+        artist_id: Some("UCMZowOoC3u_ntr9o52ekeZw"),
         album_type: Single,
         year: Some(2022),
         by_va: false,
@@ -500,6 +513,7 @@ MusicSearchFiltered(
             name: "Hobino",
           ),
         ],
+        artist_id: Some("UCX6v_euBwliDYV2NMTouuSA"),
         album_type: Single,
         year: Some(2022),
         by_va: false,
@@ -535,6 +549,7 @@ MusicSearchFiltered(
             name: "Tee See Connection",
           ),
         ],
+        artist_id: Some("UCAlOD5s3Ro27M61-2Z_UB7w"),
         album_type: Single,
         year: Some(2013),
         by_va: false,
@@ -570,6 +585,7 @@ MusicSearchFiltered(
             name: "Franco Vitola",
           ),
         ],
+        artist_id: Some("UC77rFNJxH8Y2VwSYp8ZTXHA"),
         album_type: Single,
         year: Some(2020),
         by_va: false,
@@ -605,6 +621,7 @@ MusicSearchFiltered(
             name: "Black Mamba",
           ),
         ],
+        artist_id: Some("UCxX9tNcQgCBuU56ezupriqg"),
         album_type: Album,
         year: Some(2011),
         by_va: false,
@@ -640,6 +657,7 @@ MusicSearchFiltered(
             name: "WookTheCrook",
           ),
         ],
+        artist_id: Some("UC6Y8G45J9Uv2EsLLOatymOw"),
         album_type: Single,
         year: Some(2022),
         by_va: false,
@@ -675,6 +693,7 @@ MusicSearchFiltered(
             name: "The Black Mamba",
           ),
         ],
+        artist_id: Some("UCaDT20-B3U8h-tPg_VMvntw"),
         album_type: Album,
         year: Some(2012),
         by_va: false,
@@ -710,6 +729,7 @@ MusicSearchFiltered(
             name: "Voltage",
           ),
         ],
+        artist_id: Some("UCJq1MEuNM0SidXn5pMqqHBA"),
         album_type: Single,
         year: Some(2019),
         by_va: false,

src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_default.snap

@@ -226,6 +226,7 @@ MusicSearchResult(
           name: "aespa",
         ),
       ],
+      artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"),
       album_type: Single,
       year: Some(2020),
       by_va: false,
@@ -261,6 +262,7 @@ MusicSearchResult(
           name: "aespa",
         ),
       ],
+      artist_id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"),
       album_type: Album,
       year: Some(2022),
       by_va: false,
@@ -296,6 +298,7 @@ MusicSearchResult(
           name: "Cojack",
         ),
       ],
+      artist_id: Some("UCZK5n7V2-iPHfUXLV2tDvzw"),
       album_type: Single,
       year: Some(2020),
       by_va: false,

src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_radio.snap

@@ -194,6 +194,7 @@ MusicSearchResult(
         ),
       ],
       artists: [],
+      artist_id: None,
       album_type: Album,
       year: Some(2016),
       by_va: true,
@@ -224,6 +225,7 @@ MusicSearchResult(
         ),
       ],
       artists: [],
+      artist_id: None,
       album_type: Album,
       year: Some(2022),
       by_va: true,
@@ -259,6 +261,7 @@ MusicSearchResult(
           name: "Strange Radio",
         ),
       ],
+      artist_id: Some("UCG7LUZBrK6GcfTwowTeTiOQ"),
       album_type: Album,
       year: Some(2002),
       by_va: false,

src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_typo.snap

@@ -199,6 +199,7 @@ MusicSearchResult(
           name: "Namika",
         ),
       ],
+      artist_id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"),
       album_type: Single,
       year: Some(2015),
       by_va: false,
@@ -234,6 +235,7 @@ MusicSearchResult(
           name: "Namika",
         ),
       ],
+      artist_id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"),
       album_type: Ep,
       year: Some(2015),
       by_va: false,
@@ -269,6 +271,7 @@ MusicSearchResult(
           name: "Boris Brejcha",
         ),
       ],
+      artist_id: Some("UCCpID8TTjkkjLCwBybAfHSg"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -304,6 +307,7 @@ MusicSearchResult(
           name: "Boris Brejcha",
         ),
       ],
+      artist_id: Some("UCCpID8TTjkkjLCwBybAfHSg"),
       album_type: Single,
       year: Some(2019),
       by_va: false,

src/model/mod.rs

@@ -1039,6 +1039,8 @@ pub struct AlbumItem {
     pub cover: Vec<Thumbnail>,
     /// Artists of the album
     pub artists: Vec<ArtistId>,
+    /// Primary artist ID
+    pub artist_id: Option<String>,
     /// Album type (Album/Single/EP)
     pub album_type: AlbumType,
     /// Release year of the album
@@ -1132,6 +1134,8 @@ pub struct MusicAlbum {
     pub cover: Vec<Thumbnail>,
     /// Artists of the album
     pub artists: Vec<ArtistId>,
+    /// Primary artist ID
+    pub artist_id: Option<String>,
     /// Album description in plaintext format
     pub description: Option<String>,
     /// Album type (Album/Single/EP)

tests/snapshots/youtube__music_album_ep.snap

@@ -13,6 +13,7 @@ MusicAlbum(
       name: "Madeline Juno",
     ),
   ],
+  artist_id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"),
   description: None,
   album_type: Ep,
   year: Some(2016),

tests/snapshots/youtube__music_album_one_artist.snap

@@ -13,6 +13,7 @@ MusicAlbum(
       name: "Oonagh",
     ),
   ],
+  artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
   description: None,
   album_type: Album,
   year: Some(2016),
@@ -401,6 +402,7 @@ MusicAlbum(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Album,
       year: None,
       by_va: false,

tests/snapshots/youtube__music_album_show.snap

@@ -13,6 +13,7 @@ MusicAlbum(
       name: "Kingdom Force",
     ),
   ],
+  artist_id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
   description: None,
   album_type: Show,
   year: Some(2022),

tests/snapshots/youtube__music_album_single.snap

@@ -17,6 +17,7 @@ MusicAlbum(
       name: "Vanessa Mai",
     ),
   ],
+  artist_id: Some("UCXGYZ-OhdOpPBamHX3K9YRg"),
   description: None,
   album_type: Single,
   year: Some(2020),

tests/snapshots/youtube__music_album_unavailable.snap

@@ -8,6 +8,7 @@ MusicAlbum(
   name: "13 Reasons Why (Season 3)",
   cover: "[cover]",
   artists: [],
+  artist_id: None,
   description: None,
   album_type: Album,
   year: Some(2019),

tests/snapshots/youtube__music_album_various_artists.snap

@@ -8,6 +8,7 @@ MusicAlbum(
   name: "＜Queendom2＞ FINAL",
   cover: "[cover]",
   artists: [],
+  artist_id: None,
   description: None,
   album_type: Single,
   year: Some(2022),

tests/snapshots/youtube__music_artist_basic.snap

@@ -21,6 +21,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2010),
       by_va: false,
@@ -35,6 +36,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2014),
       by_va: false,
@@ -49,6 +51,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Ep,
       year: Some(2008),
       by_va: false,
@@ -63,6 +66,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2012),
       by_va: false,
@@ -77,6 +81,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -91,6 +96,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2018),
       by_va: false,
@@ -105,6 +111,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -119,6 +126,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2006),
       by_va: false,
@@ -133,6 +141,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2016),
       by_va: false,
@@ -147,6 +156,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -161,6 +171,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -175,6 +186,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2008),
       by_va: false,
@@ -189,6 +201,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -203,6 +216,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2006),
       by_va: false,
@@ -217,6 +231,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2015),
       by_va: false,
@@ -231,6 +246,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Ep,
       year: Some(2015),
       by_va: false,
@@ -245,6 +261,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -259,6 +276,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Ep,
       year: Some(2010),
       by_va: false,
@@ -273,6 +291,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -287,6 +306,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2008),
       by_va: false,

tests/snapshots/youtube__music_artist_basic_all.snap

@@ -21,6 +21,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2010),
       by_va: false,
@@ -35,6 +36,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2014),
       by_va: false,
@@ -49,6 +51,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Ep,
       year: Some(2008),
       by_va: false,
@@ -63,6 +66,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2012),
       by_va: false,
@@ -77,6 +81,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2012),
       by_va: false,
@@ -91,6 +96,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2015),
       by_va: false,
@@ -105,6 +111,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2015),
       by_va: false,
@@ -119,6 +126,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2012),
       by_va: false,
@@ -133,6 +141,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2004),
       by_va: false,
@@ -147,6 +156,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -161,6 +171,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2018),
       by_va: false,
@@ -175,6 +186,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2003),
       by_va: false,
@@ -189,6 +201,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2012),
       by_va: false,
@@ -203,6 +216,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -217,6 +231,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2006),
       by_va: false,
@@ -231,6 +246,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2000),
       by_va: false,
@@ -245,6 +261,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2016),
       by_va: false,
@@ -259,6 +276,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -273,6 +291,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2012),
       by_va: false,
@@ -287,6 +306,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -301,6 +321,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2008),
       by_va: false,
@@ -315,6 +336,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2021),
       by_va: false,
@@ -329,6 +351,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2021),
       by_va: false,
@@ -343,6 +366,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Ep,
       year: Some(2003),
       by_va: false,
@@ -357,6 +381,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2010),
       by_va: false,
@@ -371,6 +396,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2006),
       by_va: false,
@@ -385,6 +411,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2010),
       by_va: false,
@@ -399,6 +426,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2015),
       by_va: false,
@@ -413,6 +441,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2002),
       by_va: false,
@@ -427,6 +456,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Ep,
       year: Some(2015),
       by_va: false,
@@ -441,6 +471,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2004),
       by_va: false,
@@ -455,6 +486,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -469,6 +501,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Ep,
       year: Some(2003),
       by_va: false,
@@ -483,6 +516,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2007),
       by_va: false,
@@ -497,6 +531,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Ep,
       year: Some(2010),
       by_va: false,
@@ -511,6 +546,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2012),
       by_va: false,
@@ -525,6 +561,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -539,6 +576,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2010),
       by_va: false,
@@ -553,6 +591,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2008),
       by_va: false,
@@ -567,6 +606,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2010),
       by_va: false,
@@ -581,6 +621,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2008),
       by_va: false,
@@ -595,6 +636,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Single,
       year: Some(2010),
       by_va: false,
@@ -609,6 +651,7 @@ MusicArtist(
           name: "Unheilig",
         ),
       ],
+      artist_id: Some("UC7cl4MmM6ZZ2TcFyMk_b4pg"),
       album_type: Album,
       year: Some(2017),
       by_va: false,

tests/snapshots/youtube__music_artist_no_more_albums.snap

@@ -21,6 +21,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2016),
       by_va: false,
@@ -35,6 +36,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2014),
       by_va: false,
@@ -49,6 +51,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Album,
       year: Some(2014),
       by_va: false,
@@ -63,6 +66,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2007),
       by_va: false,
@@ -77,6 +81,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Album,
       year: Some(2020),
       by_va: false,
@@ -91,6 +96,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -105,6 +111,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2017),
       by_va: false,
@@ -119,6 +126,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2020),
       by_va: false,
@@ -133,6 +141,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2016),
       by_va: false,
@@ -147,6 +156,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Album,
       year: Some(2015),
       by_va: false,
@@ -161,6 +171,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Album,
       year: Some(2019),
       by_va: false,
@@ -175,6 +186,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2006),
       by_va: false,
@@ -189,6 +201,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Album,
       year: Some(2016),
       by_va: false,
@@ -203,6 +216,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2019),
       by_va: false,
@@ -217,6 +231,7 @@ MusicArtist(
           name: "Oonagh",
         ),
       ],
+      artist_id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
       album_type: Single,
       year: Some(2014),
       by_va: false,

tests/snapshots/youtube__music_artist_only_singles.snap

@@ -21,6 +21,7 @@ MusicArtist(
           name: "Sulli",
         ),
       ],
+      artist_id: Some("UCfwCE5VhPMGxNPFxtVv7lRw"),
       album_type: Single,
       year: Some(2019),
       by_va: false,

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_album_{}", name), artist, {
+    insta::assert_ron_snapshot!(format!("music_artist_{}", name), artist, {
         ".header_image" => "[header_image]",
         ".subscriber_count" => "[subscriber_count]",
         ".albums[].cover" => "[cover]",
@@ -1662,6 +1662,7 @@ async fn music_search_albums(
     assert_eq!(album_artist.id.as_ref().unwrap(), artist_id);
     assert_eq!(album_artist.name, artist);
 
+    assert_eq!(album.artist_id.as_ref().unwrap(), artist_id);
     assert!(!album.cover.is_empty(), "got no cover");
     assert_eq!(album.year.as_ref().unwrap(), &year);
     assert_eq!(album.album_type, album_type);