ThetaDev/rustypipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 10 Activity

Compare commits

base: ThetaDev:402f5834d2e7f621b2d1c820c8d45ff6e24dd6bf
Branches Tags
ThetaDev:main
ThetaDev:feat/http3
ThetaDev:feat/postprocessor
ThetaDev:feat/channel-tv
ThetaDev:rustypipe-cli/v0.2.2
ThetaDev:rustypipe-downloader/v0.2.2
ThetaDev:rustypipe/v0.5.0
ThetaDev:rustypipe-cli/v0.2.1
ThetaDev:rustypipe-downloader/v0.2.1
ThetaDev:rustypipe/v0.4.0
ThetaDev:rustypipe-cli/v0.2.0
ThetaDev:rustypipe-downloader/v0.2.0
ThetaDev:rustypipe/v0.3.0
ThetaDev:rustypipe/v0.2.1
ThetaDev:rustypipe-cli/v0.1.1
ThetaDev:rustypipe-downloader/v0.1.1
ThetaDev:rustypipe/v0.2.0
ThetaDev:rustypipe/v0.1.3
ThetaDev:rustypipe/v0.1.2
ThetaDev:rustypipe/v0.1.1
ThetaDev:rustypipe-cli/v0.1.0
ThetaDev:rustypipe-downloader/v0.1.0
ThetaDev:rustypipe/v0.1.0
..
compare: ThetaDev:9e4787f501c3d0c603fd81cf14a4228248ffc4ca
Branches Tags
ThetaDev:main
ThetaDev:feat/http3
ThetaDev:feat/postprocessor
ThetaDev:feat/channel-tv
ThetaDev:rustypipe-cli/v0.2.2
ThetaDev:rustypipe-downloader/v0.2.2
ThetaDev:rustypipe/v0.5.0
ThetaDev:rustypipe-cli/v0.2.1
ThetaDev:rustypipe-downloader/v0.2.1
ThetaDev:rustypipe/v0.4.0
ThetaDev:rustypipe-cli/v0.2.0
ThetaDev:rustypipe-downloader/v0.2.0
ThetaDev:rustypipe/v0.3.0
ThetaDev:rustypipe/v0.2.1
ThetaDev:rustypipe-cli/v0.1.1
ThetaDev:rustypipe-downloader/v0.1.1
ThetaDev:rustypipe/v0.2.0
ThetaDev:rustypipe/v0.1.3
ThetaDev:rustypipe/v0.1.2
ThetaDev:rustypipe/v0.1.1
ThetaDev:rustypipe-cli/v0.1.0
ThetaDev:rustypipe-downloader/v0.1.0
ThetaDev:rustypipe/v0.1.0

No commits in common. "402f5834d2e7f621b2d1c820c8d45ff6e24dd6bf" and "9e4787f501c3d0c603fd81cf14a4228248ffc4ca" have entirely different histories.
402f5834d2 ... 9e4787f501

33 changed files with 1040 additions and 765 deletions
Show stats Expand all files Collapse all files

34
src/client/music_playlist.rs
View file

@ -10,7 +10,7 @@ use crate::{
use super::{ use super::{
response::{ response::{
self, self,
music_item::{map_album_type, map_artist_id, map_artists, MusicListMapper}, music_item::{map_album_type, map_artists, MusicListMapper},
}, },
ClientType, MapResponse, QBrowse, RustyPipeQuery, ClientType, MapResponse, QBrowse, RustyPipeQuery,
}; };
@ -274,6 +274,18 @@ impl MapResponse<MusicAlbum> for response::MusicPlaylist {
"no sectionListRenderer content", "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 mut subtitle_split = header.subtitle.split(util::DOT_SEPARATOR);
let year_txt = subtitle_split.try_swap_remove(2).map(|cmp| cmp.to_string()); let year_txt = subtitle_split.try_swap_remove(2).map(|cmp| cmp.to_string());
@ -287,25 +299,6 @@ impl MapResponse<MusicAlbum> for response::MusicPlaylist {
let album_type = map_album_type(album_type_txt.as_str(), lang); 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 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( let mut mapper = MusicListMapper::with_album(
lang, lang,
artists.clone(), artists.clone(),
@ -333,7 +326,6 @@ impl MapResponse<MusicAlbum> for response::MusicPlaylist {
name: header.title, name: header.title,
cover: header.thumbnail.into(), cover: header.thumbnail.into(),
artists, artists,
artist_id,
description: header.description, description: header.description,
album_type, album_type,
year, year,

46
src/client/response/music_item.rs
View file

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

5
src/client/response/music_playlist.rs
View file

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

107
src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_default.snap
View file

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

20
src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_cont.snap
View file

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

15
src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_no_more_albums.snap
View file

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

39
src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_only_more_singles.snap
View file

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

1
src/client/snapshots/rustypipe__client__music_artist__tests__map_music_artist_only_singles.snap
View file

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

2
src/client/snapshots/rustypipe__client__music_details__tests__map_music_related.snap
View file

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

200
src/client/snapshots/rustypipe__client__music_new__tests__map_music_new_albums_default.snap
View file

File diff suppressed because it is too large Load diff

1
src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_description.snap
View file

@ -34,7 +34,6 @@ MusicAlbum(
name: "Adele", 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)"), 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, album_type: Album,
year: Some(2015), year: Some(2015),

2
src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_one_artist.snap
View file

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

1
src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_single.snap
View file

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

1
src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_unavailable.snap
View file

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

1
src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_various_artists.snap
View file

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

20
src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_albums.snap
View file

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

3
src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_default.snap
View file

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

3
src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_radio.snap
View file

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

4
src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_main_typo.snap
View file

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

4
src/model/mod.rs
View file

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

1207
tests/snapshots/youtube__music_album_audiobook.snap
View file

File diff suppressed because it is too large Load diff

20
tests/snapshots/youtube__music_artist_basic.snap → tests/snapshots/youtube__music_album_basic.snap
View file

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

43
tests/snapshots/youtube__music_artist_basic_all.snap → tests/snapshots/youtube__music_album_basic_all.snap
View file

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

1
tests/snapshots/youtube__music_album_ep.snap
View file

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

0
tests/snapshots/youtube__music_artist_no_artist.snap → tests/snapshots/youtube__music_album_no_artist.snap
View file

15
tests/snapshots/youtube__music_artist_no_more_albums.snap → tests/snapshots/youtube__music_album_no_more_albums.snap
View file

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

2
tests/snapshots/youtube__music_album_one_artist.snap
View file

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

1
tests/snapshots/youtube__music_artist_only_singles.snap → tests/snapshots/youtube__music_album_only_singles.snap
View file

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

1
tests/snapshots/youtube__music_album_show.snap
View file

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

1
tests/snapshots/youtube__music_album_single.snap
View file

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

1
tests/snapshots/youtube__music_album_unavailable.snap
View file

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

1
tests/snapshots/youtube__music_album_various_artists.snap
View file

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

3
tests/youtube.rs
View file

@ -1447,7 +1447,7 @@ async fn music_artist(
// Sort albums to ensure consistent order // Sort albums to ensure consistent order
artist.albums.sort_by_key(|a| a.id.to_owned()); 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]", ".header_image" => "[header_image]",
".subscriber_count" => "[subscriber_count]", ".subscriber_count" => "[subscriber_count]",
".albums[].cover" => "[cover]", ".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.id.as_ref().unwrap(), artist_id);
assert_eq!(album_artist.name, artist); 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!(!album.cover.is_empty(), "got no cover");
assert_eq!(album.year.as_ref().unwrap(), &year); assert_eq!(album.year.as_ref().unwrap(), &year);
assert_eq!(album.album_type, album_type); assert_eq!(album.album_type, album_type);