From 53bdd5f0d288fe58e3d1dc93be7b1dfc899aa11d Mon Sep 17 00:00:00 2001
From: ThetaDev <t.testboy@gmail.com>
Date: Wed, 25 Jan 2023 01:02:46 +0100
Subject: [PATCH] feat: add artist radio

---
 src/client/music_artist.rs                    | 10 ++++++-
 src/client/response/music_artist.rs           |  5 +++-
 src/client/response/music_item.rs             |  4 +--
 ...tist__tests__map_music_artist_default.snap |  1 +
 ...st__tests__map_music_artist_no_artist.snap |  1 +
 ...tist__tests__map_music_artist_no_cont.snap |  1 +
 ...ests__map_music_artist_no_more_albums.snap |  1 +
 ...s__map_music_artist_only_more_singles.snap |  1 +
 ..._tests__map_music_artist_only_singles.snap |  1 +
 src/model/mod.rs                              |  2 ++
 .../youtube__music_artist_basic.snap          |  1 +
 .../youtube__music_artist_basic_all.snap      |  1 +
 .../youtube__music_artist_no_artist.snap      |  1 +
 .../youtube__music_artist_no_more_albums.snap |  1 +
 .../youtube__music_artist_only_singles.snap   |  1 +
 tests/youtube.rs                              | 29 ++++++++++++++++++-
 16 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/client/music_artist.rs b/src/client/music_artist.rs
index b16dab4..12e79d4 100644
--- a/src/client/music_artist.rs
+++ b/src/client/music_artist.rs
@@ -166,7 +166,7 @@ fn map_artist_page(
     lang: crate::param::Language,
     skip_extendables: bool,
 ) -> Result<MapResult<(MusicArtist, Vec<String>)>, ExtractionError> {
-    // dbg!(&self);
+    // dbg!(&res);
 
     let header = res.header.music_immersive_header_renderer;
 
@@ -272,6 +272,13 @@ fn map_artist_page(
             .map(|m| m.as_str().to_owned())
     });
 
+    let radio_id = header.start_radio_button.and_then(|b| {
+        b.button_renderer
+            .navigation_endpoint
+            .watch_endpoint
+            .and_then(|w| w.playlist_id)
+    });
+
     Ok(MapResult {
         c: (
             MusicArtist {
@@ -292,6 +299,7 @@ fn map_artist_page(
                 similar_artists: mapped.c.artists,
                 tracks_playlist_id,
                 videos_playlist_id,
+                radio_id,
             },
             album_page_params,
         ),
diff --git a/src/client/response/music_artist.rs b/src/client/response/music_artist.rs
index 811432b..e27f3a0 100644
--- a/src/client/response/music_artist.rs
+++ b/src/client/response/music_artist.rs
@@ -5,7 +5,7 @@ use crate::serializer::text::Text;
 
 use super::{
     music_item::{
-        Grid, ItemSection, MusicThumbnailRenderer, SimpleHeader, SingleColumnBrowseResult,
+        Button, Grid, ItemSection, MusicThumbnailRenderer, SimpleHeader, SingleColumnBrowseResult,
     },
     SectionList, Tab,
 };
@@ -41,6 +41,9 @@ pub(crate) struct MusicHeaderRenderer {
     #[serde(default)]
     #[serde_as(as = "DefaultOnError")]
     pub share_endpoint: Option<ShareEndpoint>,
+    #[serde(default)]
+    #[serde_as(as = "DefaultOnError")]
+    pub start_radio_button: Option<Button>,
 }
 
 #[derive(Debug, Deserialize)]
diff --git a/src/client/response/music_item.rs b/src/client/response/music_item.rs
index e8110af..43d48b2 100644
--- a/src/client/response/music_item.rs
+++ b/src/client/response/music_item.rs
@@ -320,14 +320,14 @@ pub(crate) struct MusicCarouselShelfHeader {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct MusicCarouselShelfHeaderRenderer {
-    pub more_content_button: Option<MoreContentButton>,
+    pub more_content_button: Option<Button>,
     #[serde(default)]
     pub title: TextComponents,
 }
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct MoreContentButton {
+pub(crate) struct Button {
     pub button_renderer: ButtonRenderer,
 }
 
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 bfe0edb..f2b61d3 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
@@ -3649,4 +3649,5 @@ MusicArtist(
   ],
   tracks_playlist_id: Some("OLAK5uy_mHzt_lZ0Vdnv3NAqvCLQw5CiYe0q96iBs"),
   videos_playlist_id: Some("OLAK5uy_k9FAxC8Xb8T0KqP5wFbn8KsP3VkUjb334"),
+  radio_id: Some("RDEM_Ktu-TilkxtLvmc9wX1MLQ"),
 )
diff --git a/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_artist.snap b/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_artist.snap
index 186340b..550394f 100644
--- a/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_artist.snap
+++ b/src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_artist.snap
@@ -152,4 +152,5 @@ MusicArtist(
   similar_artists: [],
   tracks_playlist_id: None,
   videos_playlist_id: None,
+  radio_id: None,
 )
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 8269097..eccfdc9 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
@@ -1387,4 +1387,5 @@ MusicArtist(
   ],
   tracks_playlist_id: Some("OLAK5uy_mHzt_lZ0Vdnv3NAqvCLQw5CiYe0q96iBs"),
   videos_playlist_id: Some("OLAK5uy_k9FAxC8Xb8T0KqP5wFbn8KsP3VkUjb334"),
+  radio_id: Some("RDEM_Ktu-TilkxtLvmc9wX1MLQ"),
 )
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 ed664a6..b4185f6 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
@@ -966,4 +966,5 @@ MusicArtist(
   ],
   tracks_playlist_id: Some("OLAK5uy_m6843aeUO05cz_t1seql2dQ9eUgwyuOXI"),
   videos_playlist_id: None,
+  radio_id: Some("RDEMd8PZIv9CPsvvEDbo_pUD4w"),
 )
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 3a8e603..7b574fa 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
@@ -1885,4 +1885,5 @@ MusicArtist(
   ],
   tracks_playlist_id: Some("OLAK5uy_nGjQIyWU6PsJZdJst7WOJHVZ7N7DupP04"),
   videos_playlist_id: Some("OLAK5uy_mulXOv4f1FNKi1-0zgY3YouLDTXX2wLu4"),
+  radio_id: Some("RDEMzMxPuaGyofN40xcgHuZAbw"),
 )
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 e8e3c48..552d1bb 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
@@ -626,4 +626,5 @@ MusicArtist(
   ],
   tracks_playlist_id: None,
   videos_playlist_id: Some("OLAK5uy_lmH3iVq6lqjsnLkBWzpvRTh0DidLzbU-I"),
+  radio_id: Some("RDEMYsk_DTFHAng1G7n5toi_oA"),
 )
diff --git a/src/model/mod.rs b/src/model/mod.rs
index adfa535..fb46353 100644
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@@ -1111,6 +1111,8 @@ pub struct MusicArtist {
     pub tracks_playlist_id: Option<String>,
     /// ID of the playlist containging the artist's videos
     pub videos_playlist_id: Option<String>,
+    /// ID of the artist radio
+    pub radio_id: Option<String>,
 }
 
 /// YouTube Music search result
diff --git a/tests/snapshots/youtube__music_artist_basic.snap b/tests/snapshots/youtube__music_artist_basic.snap
index 7547cc8..27a6839 100644
--- a/tests/snapshots/youtube__music_artist_basic.snap
+++ b/tests/snapshots/youtube__music_artist_basic.snap
@@ -316,4 +316,5 @@ MusicArtist(
   similar_artists: "[artists]",
   tracks_playlist_id: Some("OLAK5uy_n6aX-F_lCQxgyTIv4FJhp78bXV93b9NUM"),
   videos_playlist_id: Some("OLAK5uy_nrePwvOEzmO7SydszEFfCDu8gAJxKfFtw"),
+  radio_id: Some("RDEMdgjzN3Qrk_GD7BooQbkJ4A"),
 )
diff --git a/tests/snapshots/youtube__music_artist_basic_all.snap b/tests/snapshots/youtube__music_artist_basic_all.snap
index 5471856..954148f 100644
--- a/tests/snapshots/youtube__music_artist_basic_all.snap
+++ b/tests/snapshots/youtube__music_artist_basic_all.snap
@@ -661,4 +661,5 @@ MusicArtist(
   similar_artists: "[artists]",
   tracks_playlist_id: Some("OLAK5uy_n6aX-F_lCQxgyTIv4FJhp78bXV93b9NUM"),
   videos_playlist_id: Some("OLAK5uy_nrePwvOEzmO7SydszEFfCDu8gAJxKfFtw"),
+  radio_id: Some("RDEMdgjzN3Qrk_GD7BooQbkJ4A"),
 )
diff --git a/tests/snapshots/youtube__music_artist_no_artist.snap b/tests/snapshots/youtube__music_artist_no_artist.snap
index c5e148b..4ccec76 100644
--- a/tests/snapshots/youtube__music_artist_no_artist.snap
+++ b/tests/snapshots/youtube__music_artist_no_artist.snap
@@ -15,4 +15,5 @@ MusicArtist(
   similar_artists: "[artists]",
   tracks_playlist_id: None,
   videos_playlist_id: None,
+  radio_id: None,
 )
diff --git a/tests/snapshots/youtube__music_artist_no_more_albums.snap b/tests/snapshots/youtube__music_artist_no_more_albums.snap
index ce9ddad..940f4a2 100644
--- a/tests/snapshots/youtube__music_artist_no_more_albums.snap
+++ b/tests/snapshots/youtube__music_artist_no_more_albums.snap
@@ -151,4 +151,5 @@ MusicArtist(
   similar_artists: "[artists]",
   tracks_playlist_id: Some("OLAK5uy_miHesZCUQY5S9EwqfoNP2tZR9nZ0NBAeU"),
   videos_playlist_id: Some("OLAK5uy_mqbgE6T9uvusUWrAxJGiImf4_P4dM7IvQ"),
+  radio_id: Some("RDEM7AbogW0cCnElSU0WYm1GqA"),
 )
diff --git a/tests/snapshots/youtube__music_artist_only_singles.snap b/tests/snapshots/youtube__music_artist_only_singles.snap
index 3868e54..9258bcb 100644
--- a/tests/snapshots/youtube__music_artist_only_singles.snap
+++ b/tests/snapshots/youtube__music_artist_only_singles.snap
@@ -31,4 +31,5 @@ MusicArtist(
   similar_artists: "[artists]",
   tracks_playlist_id: None,
   videos_playlist_id: Some("OLAK5uy_lmH3iVq6lqjsnLkBWzpvRTh0DidLzbU-I"),
+  radio_id: Some("RDEMYsk_DTFHAng1G7n5toi_oA"),
 )
diff --git a/tests/youtube.rs b/tests/youtube.rs
index 90f2122..d621194 100644
--- a/tests/youtube.rs
+++ b/tests/youtube.rs
@@ -2031,7 +2031,34 @@ async fn music_radio_playlist_not_found() {
         .music_radio_playlist("PL5dDx681T4bR7ZF1IuWzOv1omlZZZZZZZ")
         .await;
 
-    // Currently this returns valid data
+    if let Err(err) = res {
+        assert!(
+            matches!(
+                err,
+                Error::Extraction(ExtractionError::ContentUnavailable(_))
+            ),
+            "got: {}",
+            err
+        );
+    }
+}
+
+#[tokio::test]
+async fn music_radio_artist() {
+    let rp = RustyPipe::builder().strict().build();
+    let tracks = rp
+        .query()
+        .music_radio("RDEM_Ktu-TilkxtLvmc9wX1MLQ")
+        .await
+        .unwrap();
+    assert_next_items(tracks, rp.query(), 20).await;
+}
+
+#[tokio::test]
+async fn music_radio_not_found() {
+    let rp = RustyPipe::builder().strict().build();
+    let res = rp.query().music_radio("RDEM_Ktu-TilkxtLvmc9wXZZZZ").await;
+
     if let Err(err) = res {
         assert!(
             matches!(