From a7db75ff075aebe57eaecf646008f583a10353b2 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Wed, 2 Nov 2022 16:58:07 +0100 Subject: [PATCH 1/2] WIP: new artistid model --- src/model/mod.rs | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/src/model/mod.rs b/src/model/mod.rs index 41fd5eb..cdbd2dd 100644 --- a/src/model/mod.rs +++ b/src/model/mod.rs @@ -875,15 +875,7 @@ pub struct TrackItem { /// Album cover pub cover: Vec, /// Artists of the track - /// - /// **Note:** this field only contains artists that have a link attached - /// to them. You may want to use `artists_txt` as a fallback. - pub artists: Vec, - /// Full content of the artists column - /// - /// Conjunction words/characters depend on language and fetched page. - /// Includes unlinked artists. - pub artists_txt: Option, + pub artists: Vec, /// Album of the track pub album: Option, /// View count @@ -914,6 +906,14 @@ pub struct ArtistItem { pub subscriber_count: Option, } +/// YouTube Music artist identifier +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +#[non_exhaustive] +pub struct ArtistId { + pub id: Option, + pub name: String, +} + /// YouTube Music album list item #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] #[non_exhaustive] @@ -925,12 +925,7 @@ pub struct AlbumItem { /// Album cover pub cover: Vec, /// Artists of the album - pub artists: Vec, - /// Full content of the artists field - /// - /// Conjunction words/characters depend on language and fetched page. - /// Includes unlinked artists. - pub artists_txt: String, + pub artists: Vec, /// Album type (Album/Single/EP) pub album_type: AlbumType, /// Release year of the album @@ -1019,12 +1014,7 @@ pub struct MusicAlbum { /// Album cover pub cover: Vec, /// Artists of the album - pub artists: Vec, - /// Full content of the artists field - /// - /// Conjunction words/characters depend on language and fetched page. - /// Includes unlinked artists. - pub artists_txt: String, + pub artists: Vec, /// Album type (Album/Single/EP) pub album_type: AlbumType, /// Release year From 01a131ed6f9e8cfd29a23cbc66743d507417b535 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Wed, 2 Nov 2022 21:22:35 +0100 Subject: [PATCH 2/2] fix: improve album artist parsing, remove artists_txt field --- src/client/music_playlist.rs | 21 +- src/client/response/music_item.rs | 117 +- ...st__tests__map_music_album_one_artist.snap | 227 +- ...aylist__tests__map_music_album_single.snap | 25 +- ...ests__map_music_album_various_artists.snap | 88 +- ...ylist__tests__map_music_playlist_long.snap | 532 +-- ...st__tests__map_music_playlist_nomusic.snap | 528 ++- ...list__tests__map_music_playlist_short.snap | 451 +- ...earch__tests__map_music_search_albums.snap | 128 +- ...arch__tests__map_music_search_default.snap | 57 +- ...ests__map_music_search_tracks_default.snap | 115 +- ...__tests__map_music_search_tracks_typo.snap | 106 +- ...tests__map_music_search_tracks_videos.snap | 100 +- ..._search__tests__map_music_search_typo.snap | 54 +- ...agination__tests__map_playlist_tracks.snap | 551 +-- ..._pagination__tests__map_search_tracks.snap | 114 +- src/model/mod.rs | 2 + src/serializer/text.rs | 43 +- .../youtube__music_album_audiobook.snap | 3812 +++++++++++++---- tests/snapshots/youtube__music_album_ep.snap | 65 +- .../youtube__music_album_one_artist.snap | 227 +- .../snapshots/youtube__music_album_show.snap | 173 +- .../youtube__music_album_single.snap | 25 +- .../youtube__music_album_various_artists.snap | 88 +- tests/youtube.rs | 18 +- 25 files changed, 5008 insertions(+), 2659 deletions(-) diff --git a/src/client/music_playlist.rs b/src/client/music_playlist.rs index 6f362a2..9fdb89f 100644 --- a/src/client/music_playlist.rs +++ b/src/client/music_playlist.rs @@ -2,7 +2,7 @@ use std::borrow::Cow; use crate::{ error::{Error, ExtractionError}, - model::{ChannelId, MusicAlbum, MusicPlaylist, Paginator}, + model::{AlbumId, ChannelId, MusicAlbum, MusicPlaylist, Paginator}, serializer::MapResult, util::{self, TryRemove}, }; @@ -194,22 +194,24 @@ impl MapResponse for response::MusicPlaylist { let year_txt = subtitle_split.try_swap_remove(2).map(|cmp| cmp.to_string()); let artists_p = subtitle_split.try_swap_remove(1); - let (artists, artists_txt) = map_artists(artists_p); + let (artists, by_va) = map_artists(artists_p); let album_type_txt = subtitle_split .try_swap_remove(0) .map(|part| part.to_string()) .unwrap_or_default(); - let by_va = artists_txt == util::VARIOUS_ARTISTS; 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 mut mapper = match by_va { - true => MusicListMapper::new(lang), - false => { - MusicListMapper::with_artists(lang, artists.clone(), artists_txt.clone(), false) - } - }; + let mut mapper = MusicListMapper::with_album( + lang, + artists.clone(), + by_va, + AlbumId { + id: id.to_owned(), + name: header.title.to_owned(), + }, + ); mapper.map_response(shelf.contents); let tracks_res = mapper.conv_items(); let mut warnings = tracks_res.warnings; @@ -228,7 +230,6 @@ impl MapResponse for response::MusicPlaylist { name: header.title, cover: header.thumbnail.into(), artists, - artists_txt, album_type, year, by_va, diff --git a/src/client/response/music_item.rs b/src/client/response/music_item.rs index cb08835..a6658af 100644 --- a/src/client/response/music_item.rs +++ b/src/client/response/music_item.rs @@ -3,8 +3,8 @@ use serde_with::{serde_as, DefaultOnError, VecSkipError}; use crate::{ model::{ - self, AlbumId, AlbumItem, AlbumType, ArtistItem, ChannelId, FromYtItem, MusicEntityType, - MusicItem, MusicPlaylistItem, TrackItem, + self, AlbumId, AlbumItem, AlbumType, ArtistId, ArtistItem, ChannelId, FromYtItem, + MusicEntityType, MusicItem, MusicPlaylistItem, TrackItem, }, param::Language, serializer::{ @@ -194,7 +194,9 @@ pub(crate) struct ContinuationContents { #[derive(Debug)] pub(crate) struct MusicListMapper { lang: Language, - o_artists: Option<(Vec, String)>, + /// Artists list + various artists flag + artists: Option<(Vec, bool)>, + album: Option, artist_page: bool, items: Vec, warnings: Vec, @@ -212,26 +214,40 @@ impl MusicListMapper { pub fn new(lang: Language) -> Self { Self { lang, - o_artists: None, + artists: None, + album: None, artist_page: false, items: Vec::new(), warnings: Vec::new(), } } + /* pub fn with_artists( lang: Language, - artists: Vec, - artists_txt: String, + artists: Vec, + by_va: bool, artist_page: bool, ) -> Self { Self { lang, - o_artists: Some((artists, artists_txt)), + artists: Some((artists, by_va)), + album: None, artist_page, items: Vec::new(), warnings: Vec::new(), } + }*/ + + pub fn with_album(lang: Language, artists: Vec, by_va: bool, album: AlbumId) -> Self { + Self { + lang, + artists: Some((artists, by_va)), + album: Some(album), + artist_page: false, + items: Vec::new(), + warnings: Vec::new(), + } } fn map_item(&mut self, item: MusicResponseItem) -> Result { @@ -281,7 +297,7 @@ impl MusicListMapper { .map(|st| map_album_type(st.first_str(), self.lang)) .unwrap_or_default(); - let (artists, artists_txt) = map_artists(subtitle_p2); + let (artists, by_va) = map_artists(subtitle_p2); let year = subtitle_p3 .and_then(|st| util::parse_numeric(st.first_str()).ok()); @@ -291,9 +307,9 @@ impl MusicListMapper { name: title, cover: item.thumbnail.into(), artists, - artists_txt, album_type, year, + by_va, })); Ok(MusicEntityType::Album) } @@ -349,8 +365,10 @@ impl MusicListMapper { let title = title.ok_or_else(|| format!("track {}: could not get title", id))?; - let is_video = - !first_tn.map(|tn| tn.height == tn.width).unwrap_or_default(); + // Videos have rectangular thumbnails, YTM tracks have square covers + // Exception: there are no thumbnails on album items + let is_video = self.album.is_none() + && !first_tn.map(|tn| tn.height == tn.width).unwrap_or_default(); let (artists_p, album_p, duration_p) = match item.flex_column_display_style { @@ -385,8 +403,8 @@ impl MusicListMapper { .and_then(|p| util::parse_video_length(p.first_str())) .ok_or_else(|| format!("track {}: could not parse duration", id))?; - // The album field contains the track count for search videos let (album, view_count) = match (item.flex_column_display_style, is_video) { + // The album field contains the view count for search videos (FlexColumnDisplayStyle::TwoLines, true) => ( None, album_p.and_then(|p| { @@ -394,29 +412,23 @@ impl MusicListMapper { }), ), (_, false) => ( - album_p.and_then(|p| { - p.0.into_iter().find_map(|c| AlbumId::try_from(c).ok()) - }), + album_p + .and_then(|p| { + p.0.into_iter().find_map(|c| AlbumId::try_from(c).ok()) + }) + .or_else(|| self.album.clone()), None, ), (FlexColumnDisplayStyle::Default, true) => (None, None), }; - let mut artists_txt = - artists_p.as_ref().and_then(TextComponents::to_opt_string); - let mut artists = artists_p - .map(|p| { - p.0.into_iter() - .filter_map(|c| ChannelId::try_from(c).ok()) - .collect::>() - }) - .unwrap_or_default(); + let (mut artists, _) = map_artists(artists_p); - if let Some(a) = &self.o_artists { - if artists.is_empty() && artists_txt.is_none() { - let xa = a.clone(); - artists = xa.0; - artists_txt = Some(xa.1); + // Fall back to the artist given when constructing the mapper. + // This is used for extracting artist pages. + if let Some(a) = &self.artists { + if artists.is_empty() { + artists = a.0.clone(); } } @@ -428,7 +440,6 @@ impl MusicListMapper { duration, cover: item.thumbnail.into(), artists, - artists_txt, album, view_count, is_video, @@ -454,23 +465,18 @@ impl MusicListMapper { let mut year = None; let mut album_type = AlbumType::Single; - let (artists, artists_txt) = - match (subtitle_p1, subtitle_p2, &self.o_artists, self.artist_page) { + let (artists, by_va) = + match (subtitle_p1, subtitle_p2, &self.artists, self.artist_page) { // "2022" (Artist singles) - (Some(year_txt), None, Some((artists, artists_txt)), true) => { + (Some(year_txt), None, Some(artists), true) => { year = util::parse_numeric(year_txt.first_str()).ok(); - (artists.clone(), artists_txt.clone()) + artists.clone() } // "Album", "2022" (Artist albums) - ( - Some(atype_txt), - Some(year_txt), - Some((artists, artists_txt)), - true, - ) => { + (Some(atype_txt), Some(year_txt), Some(artists), true) => { year = util::parse_numeric(year_txt.first_str()).ok(); album_type = map_album_type(atype_txt.first_str(), self.lang); - (artists.clone(), artists_txt.clone()) + artists.clone() } // "Album", <"Oonagh"> (Album variants, new releases) (Some(atype_txt), Some(p2), _, false) => { @@ -490,9 +496,9 @@ impl MusicListMapper { name: item.title, cover: item.thumbnail_renderer.into(), artists, - artists_txt, - year, album_type, + year, + by_va, })); Ok(MusicEntityType::Album) } @@ -595,21 +601,30 @@ impl MusicListMapper { } } -pub(crate) fn map_artists(artists_p: Option) -> (Vec, String) { - let artists_txt = artists_p - .as_ref() - .map(|p| p.to_string()) - .unwrap_or_default(); +pub(crate) fn map_artists(artists_p: Option) -> (Vec, bool) { + let mut by_va = false; let artists = artists_p .map(|part| { part.0 .into_iter() - .filter_map(|c| ChannelId::try_from(c).ok()) + .enumerate() + .filter_map(|(i, c)| { + let artist = ArtistId::from(c); + // Filter out text components with no links that are at + // odd positions (conjunctions) + if artist.id.is_none() && i % 2 == 1 { + None + } else if artist.id.is_none() && artist.name == util::VARIOUS_ARTISTS { + by_va = true; + None + } else { + Some(artist) + } + }) .collect::>() }) .unwrap_or_default(); - - (artists, artists_txt) + (artists, by_va) } pub(crate) fn map_album_type(txt: &str, lang: Language) -> AlbumType { diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_one_artist.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_one_artist.snap index a886186..cabdd32 100644 --- a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_one_artist.snap +++ b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_one_artist.snap @@ -29,12 +29,11 @@ MusicAlbum( ), ], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: "Oonagh", album_type: Album, year: Some(2016), by_va: false, @@ -45,15 +44,17 @@ MusicAlbum( duration: 216, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(1), ), TrackItem( @@ -62,15 +63,17 @@ MusicAlbum( duration: 224, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(2), ), TrackItem( @@ -79,15 +82,17 @@ MusicAlbum( duration: 176, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(3), ), TrackItem( @@ -96,15 +101,17 @@ MusicAlbum( duration: 215, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(4), ), TrackItem( @@ -113,15 +120,17 @@ MusicAlbum( duration: 268, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(5), ), TrackItem( @@ -130,15 +139,17 @@ MusicAlbum( duration: 202, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(6), ), TrackItem( @@ -147,15 +158,17 @@ MusicAlbum( duration: 185, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(7), ), TrackItem( @@ -164,15 +177,17 @@ MusicAlbum( duration: 226, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(8), ), TrackItem( @@ -181,15 +196,17 @@ MusicAlbum( duration: 207, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(9), ), TrackItem( @@ -198,15 +215,17 @@ MusicAlbum( duration: 211, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(10), ), TrackItem( @@ -215,15 +234,17 @@ MusicAlbum( duration: 179, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(11), ), TrackItem( @@ -232,15 +253,17 @@ MusicAlbum( duration: 218, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(12), ), TrackItem( @@ -249,15 +272,17 @@ MusicAlbum( duration: 277, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(13), ), TrackItem( @@ -266,15 +291,17 @@ MusicAlbum( duration: 204, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(14), ), TrackItem( @@ -283,15 +310,17 @@ MusicAlbum( duration: 202, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(15), ), TrackItem( @@ -300,15 +329,17 @@ MusicAlbum( duration: 222, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(16), ), TrackItem( @@ -317,15 +348,17 @@ MusicAlbum( duration: 177, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(17), ), TrackItem( @@ -334,15 +367,17 @@ MusicAlbum( duration: 220, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(18), ), ], @@ -363,14 +398,14 @@ MusicAlbum( ), ], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: "Oonagh", album_type: Album, year: None, + by_va: false, ), ], ) diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_single.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_single.snap index 3d21a91..dc97f4a 100644 --- a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_single.snap +++ b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_single.snap @@ -29,16 +29,15 @@ MusicAlbum( ), ], artists: [ - ChannelId( - id: "UCXGYZ-OhdOpPBamHX3K9YRg", + ArtistId( + id: Some("UCXGYZ-OhdOpPBamHX3K9YRg"), name: "Joel Brandenstein", ), - ChannelId( - id: "UCFTcSVPYRWlDoHisR-ZKwgw", + ArtistId( + id: Some("UCFTcSVPYRWlDoHisR-ZKwgw"), name: "Vanessa Mai", ), ], - artists_txt: "Joel Brandenstein & Vanessa Mai", album_type: Single, year: Some(2020), by_va: false, @@ -49,19 +48,21 @@ MusicAlbum( duration: 183, cover: [], artists: [ - ChannelId( - id: "UCXGYZ-OhdOpPBamHX3K9YRg", + ArtistId( + id: Some("UCXGYZ-OhdOpPBamHX3K9YRg"), name: "Joel Brandenstein", ), - ChannelId( - id: "UCFTcSVPYRWlDoHisR-ZKwgw", + ArtistId( + id: Some("UCFTcSVPYRWlDoHisR-ZKwgw"), name: "Vanessa Mai", ), ], - artists_txt: Some("Joel Brandenstein & Vanessa Mai"), - album: None, + album: Some(AlbumId( + id: "MPREb_bHfHGoy7vuv", + name: "Der Himmel reißt auf", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(1), ), ], diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_various_artists.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_various_artists.snap index 19db543..97ccb50 100644 --- a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_various_artists.snap +++ b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_various_artists.snap @@ -29,7 +29,6 @@ MusicAlbum( ), ], artists: [], - artists_txt: "Various Artists", album_type: Single, year: Some(2022), by_va: true, @@ -39,11 +38,18 @@ MusicAlbum( title: "Waka Boom (My Way) (feat. Lee Young Ji)", duration: 274, cover: [], - artists: [], - artists_txt: Some("HYOLYN"), - album: None, + artists: [ + ArtistId( + id: None, + name: "HYOLYN", + ), + ], + album: Some(AlbumId( + id: "MPREb_8QkDeEIawvX", + name: "＜Queendom2＞ FINAL", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(1), ), TrackItem( @@ -51,11 +57,18 @@ MusicAlbum( title: "AURA", duration: 216, cover: [], - artists: [], - artists_txt: Some("WJSN"), - album: None, + artists: [ + ArtistId( + id: None, + name: "WJSN", + ), + ], + album: Some(AlbumId( + id: "MPREb_8QkDeEIawvX", + name: "＜Queendom2＞ FINAL", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(2), ), TrackItem( @@ -64,15 +77,17 @@ MusicAlbum( duration: 239, cover: [], artists: [ - ChannelId( - id: "UCAKvDuIX3m1AUdPpDSqV_3w", + ArtistId( + id: Some("UCAKvDuIX3m1AUdPpDSqV_3w"), name: "Kep1er", ), ], - artists_txt: Some("Kep1er"), - album: None, + album: Some(AlbumId( + id: "MPREb_8QkDeEIawvX", + name: "＜Queendom2＞ FINAL", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(3), ), TrackItem( @@ -80,11 +95,18 @@ MusicAlbum( title: "Red Sun!", duration: 254, cover: [], - artists: [], - artists_txt: Some("VIVIZ"), - album: None, + artists: [ + ArtistId( + id: None, + name: "VIVIZ", + ), + ], + album: Some(AlbumId( + id: "MPREb_8QkDeEIawvX", + name: "＜Queendom2＞ FINAL", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(4), ), TrackItem( @@ -92,11 +114,18 @@ MusicAlbum( title: "POSE", duration: 187, cover: [], - artists: [], - artists_txt: Some("LOONA"), - album: None, + artists: [ + ArtistId( + id: None, + name: "LOONA", + ), + ], + album: Some(AlbumId( + id: "MPREb_8QkDeEIawvX", + name: "＜Queendom2＞ FINAL", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(5), ), TrackItem( @@ -104,11 +133,18 @@ MusicAlbum( title: "Whistle", duration: 224, cover: [], - artists: [], - artists_txt: Some("Brave Girls"), - album: None, + artists: [ + ArtistId( + id: None, + name: "Brave Girls", + ), + ], + album: Some(AlbumId( + id: "MPREb_8QkDeEIawvX", + name: "＜Queendom2＞ FINAL", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(6), ), ], diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_long.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_long.snap index c9597e6..022009c 100644 --- a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_long.snap +++ b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_long.snap @@ -44,16 +44,15 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCxpEXfdz8GpczOZ8axPLApg", + ArtistId( + id: Some("UCxpEXfdz8GpczOZ8axPLApg"), name: "Stereoact", ), - ChannelId( - id: "UCVAvAvPCnScF3XoFPzvep7g", + ArtistId( + id: Some("UCVAvAvPCnScF3XoFPzvep7g"), name: "Kerstin Ott", ), ], - artists_txt: Some("Stereoact & Kerstin Ott"), album: None, view_count: None, is_video: true, @@ -71,12 +70,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCAiYaiG1z72cEF7A4l53x3Q", + ArtistId( + id: Some("UCAiYaiG1z72cEF7A4l53x3Q"), name: "Uzzah", ), ], - artists_txt: Some("Uzzah"), album: None, view_count: None, is_video: true, @@ -94,12 +92,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCR5tGRQZrS7GpImwYUj_Drg", + ArtistId( + id: Some("UCR5tGRQZrS7GpImwYUj_Drg"), name: "Andreas Gabalier", ), ], - artists_txt: Some("Andreas Gabalier"), album: None, view_count: None, is_video: true, @@ -117,12 +114,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCsPz48w0M3QUEGAiDP1x17w", + ArtistId( + id: Some("UCsPz48w0M3QUEGAiDP1x17w"), name: "Bausa", ), ], - artists_txt: Some("Bausa"), album: None, view_count: None, is_video: true, @@ -140,12 +136,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCnAbdPb5psmj2VvDjn6FRIw", + ArtistId( + id: Some("UCnAbdPb5psmj2VvDjn6FRIw"), name: "Prince Kay One", ), ], - artists_txt: Some("Prince Kay One"), album: None, view_count: None, is_video: true, @@ -163,12 +158,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCIh4j8fXWf2U0ro0qnGU8Mg", + ArtistId( + id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), name: "Namika", ), ], - artists_txt: Some("Namika"), album: None, view_count: None, is_video: true, @@ -186,16 +180,15 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCY06CayCwdaOd1CnDgjy6uw", + ArtistId( + id: Some("UCY06CayCwdaOd1CnDgjy6uw"), name: "Maite Kelly", ), - ChannelId( - id: "UCtqi0viP-suK-okUQfaw8Ew", + ArtistId( + id: Some("UCtqi0viP-suK-okUQfaw8Ew"), name: "Roland Kaiser", ), ], - artists_txt: Some("Maite Kelly & Roland Kaiser"), album: None, view_count: None, is_video: true, @@ -213,12 +206,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCnAbdPb5psmj2VvDjn6FRIw", + ArtistId( + id: Some("UCnAbdPb5psmj2VvDjn6FRIw"), name: "Prince Kay One", ), ], - artists_txt: Some("Prince Kay One"), album: None, view_count: None, is_video: true, @@ -236,12 +228,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCTnPiL9QpipJzruQiV4fR7w", + ArtistId( + id: Some("UCTnPiL9QpipJzruQiV4fR7w"), name: "Chart Kids", ), ], - artists_txt: Some("Chart Kids"), album: None, view_count: None, is_video: true, @@ -259,12 +250,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCicJjripVxiTXbUfociVZwQ", + ArtistId( + id: Some("UCicJjripVxiTXbUfociVZwQ"), name: "MARTERIA", ), ], - artists_txt: Some("MARTERIA"), album: None, view_count: None, is_video: true, @@ -282,12 +272,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCwEIiKCL4YYnYUnkc3w418w", + ArtistId( + id: Some("UCwEIiKCL4YYnYUnkc3w418w"), name: "CRO", ), ], - artists_txt: Some("CRO"), album: None, view_count: None, is_video: true, @@ -305,12 +294,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCACOVSEb3DGote2ZHZx6jHw", + ArtistId( + id: Some("UCACOVSEb3DGote2ZHZx6jHw"), name: "KC Rebell", ), ], - artists_txt: Some("KC Rebell"), album: None, view_count: None, is_video: true, @@ -328,12 +316,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCAbxL0lZcmlaQrzoUbrvS3A", + ArtistId( + id: Some("UCAbxL0lZcmlaQrzoUbrvS3A"), name: "SDP", ), ], - artists_txt: Some("SDP"), album: None, view_count: None, is_video: true, @@ -351,12 +338,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCkQRXVZuBMktEdVyptoUgGg", + ArtistId( + id: Some("UCkQRXVZuBMktEdVyptoUgGg"), name: "Mark Forster", ), ], - artists_txt: Some("Mark Forster"), album: None, view_count: None, is_video: true, @@ -374,12 +360,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCwEIiKCL4YYnYUnkc3w418w", + ArtistId( + id: Some("UCwEIiKCL4YYnYUnkc3w418w"), name: "CRO", ), ], - artists_txt: Some("CRO"), album: None, view_count: None, is_video: true, @@ -397,12 +382,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCwEIiKCL4YYnYUnkc3w418w", + ArtistId( + id: Some("UCwEIiKCL4YYnYUnkc3w418w"), name: "CRO", ), ], - artists_txt: Some("CRO"), album: None, view_count: None, is_video: true, @@ -420,12 +404,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCRD-INDaHvHlO8K_33uKetQ", + ArtistId( + id: Some("UCRD-INDaHvHlO8K_33uKetQ"), name: "Sarah Connor", ), ], - artists_txt: Some("Sarah Connor"), album: None, view_count: None, is_video: true, @@ -443,12 +426,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCiBODJaGfd1aBHE7BF_Iv7w", + ArtistId( + id: Some("UCiBODJaGfd1aBHE7BF_Iv7w"), name: "Nimo", ), ], - artists_txt: Some("Nimo"), album: None, view_count: None, is_video: true, @@ -466,16 +448,15 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCvvMm92fPNQNRj54GTPV6UQ", + ArtistId( + id: Some("UCvvMm92fPNQNRj54GTPV6UQ"), name: "Xavier Naidoo", ), - ChannelId( - id: "UCS9E7hCpXnbB-UFlLXgGC6g", + ArtistId( + id: Some("UCS9E7hCpXnbB-UFlLXgGC6g"), name: "RZA", ), ], - artists_txt: Some("Xavier Naidoo & RZA"), album: None, view_count: None, is_video: true, @@ -493,12 +474,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCEHalRyK7ZSFafTtAn3uYIA", + ArtistId( + id: Some("UCEHalRyK7ZSFafTtAn3uYIA"), name: "Max Giesinger", ), ], - artists_txt: Some("Max Giesinger"), album: None, view_count: None, is_video: true, @@ -516,12 +496,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCuNyvmBfTzQZmWI2rsVX3QQ", + ArtistId( + id: Some("UCuNyvmBfTzQZmWI2rsVX3QQ"), name: "Alligatoah", ), ], - artists_txt: Some("Alligatoah"), album: None, view_count: None, is_video: true, @@ -539,12 +518,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCgosMU69MpoCqhuS1JZj6Cw", + ArtistId( + id: Some("UCgosMU69MpoCqhuS1JZj6Cw"), name: "Sido", ), ], - artists_txt: Some("Sido"), album: None, view_count: None, is_video: true, @@ -562,12 +540,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCAbxL0lZcmlaQrzoUbrvS3A", + ArtistId( + id: Some("UCAbxL0lZcmlaQrzoUbrvS3A"), name: "SDP", ), ], - artists_txt: Some("SDP"), album: None, view_count: None, is_video: true, @@ -585,12 +562,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCAOPSjipxqxXk5mctGHiUoQ", + ArtistId( + id: Some("UCAOPSjipxqxXk5mctGHiUoQ"), name: "Kurdo", ), ], - artists_txt: Some("Kurdo"), album: None, view_count: None, is_video: true, @@ -608,12 +584,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCyRQa8Azw8K6ISSd4INDGjQ", + ArtistId( + id: Some("UCyRQa8Azw8K6ISSd4INDGjQ"), name: "Gestört aber GeiL", ), ], - artists_txt: Some("Gestört aber GeiL"), album: None, view_count: None, is_video: true, @@ -631,12 +606,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCkQRXVZuBMktEdVyptoUgGg", + ArtistId( + id: Some("UCkQRXVZuBMktEdVyptoUgGg"), name: "Mark Forster", ), ], - artists_txt: Some("Mark Forster"), album: None, view_count: None, is_video: true, @@ -654,12 +628,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCVAvAvPCnScF3XoFPzvep7g", + ArtistId( + id: Some("UCVAvAvPCnScF3XoFPzvep7g"), name: "Kerstin Ott", ), ], - artists_txt: Some("Kerstin Ott"), album: None, view_count: None, is_video: true, @@ -677,12 +650,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCJjgJI2vEDxGZYbQ_-2ZGXQ", + ArtistId( + id: Some("UCJjgJI2vEDxGZYbQ_-2ZGXQ"), name: "Adel Tawil", ), ], - artists_txt: Some("Adel Tawil"), album: None, view_count: None, is_video: true, @@ -700,12 +672,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCK2ZLsY9Mb_dxZiZfKE3lGg", + ArtistId( + id: Some("UCK2ZLsY9Mb_dxZiZfKE3lGg"), name: "AnnenMayKantereit", ), ], - artists_txt: Some("AnnenMayKantereit"), album: None, view_count: None, is_video: true, @@ -723,12 +694,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCZwxolUWIeUty9Ru39pKNIw", + ArtistId( + id: Some("UCZwxolUWIeUty9Ru39pKNIw"), name: "Revolverheld", ), ], - artists_txt: Some("Revolverheld"), album: None, view_count: None, is_video: true, @@ -746,12 +716,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCr_mpK4vqxfUmyiMolCPfPA", + ArtistId( + id: Some("UCr_mpK4vqxfUmyiMolCPfPA"), name: "Peter Fox", ), ], - artists_txt: Some("Peter Fox"), album: None, view_count: None, is_video: true, @@ -769,12 +738,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCVRREKn7V1Cb8qvf43dwZ6w", + ArtistId( + id: Some("UCVRREKn7V1Cb8qvf43dwZ6w"), name: "257ers", ), ], - artists_txt: Some("257ers"), album: None, view_count: None, is_video: true, @@ -792,12 +760,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCFEQ-Z7CSAA3pqegM1VywrQ", + ArtistId( + id: Some("UCFEQ-Z7CSAA3pqegM1VywrQ"), name: "Laserkraft 3D", ), ], - artists_txt: Some("Laserkraft 3D"), album: None, view_count: None, is_video: true, @@ -815,12 +782,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCDkoIRV3UeF4k3F_TgFCPEQ", + ArtistId( + id: Some("UCDkoIRV3UeF4k3F_TgFCPEQ"), name: "Miami Yacine", ), ], - artists_txt: Some("Miami Yacine"), album: None, view_count: None, is_video: true, @@ -838,12 +804,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCK2ZLsY9Mb_dxZiZfKE3lGg", + ArtistId( + id: Some("UCK2ZLsY9Mb_dxZiZfKE3lGg"), name: "AnnenMayKantereit", ), ], - artists_txt: Some("AnnenMayKantereit"), album: None, view_count: None, is_video: true, @@ -861,12 +826,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCvvMm92fPNQNRj54GTPV6UQ", + ArtistId( + id: Some("UCvvMm92fPNQNRj54GTPV6UQ"), name: "Xavier Naidoo", ), ], - artists_txt: Some("Xavier Naidoo"), album: None, view_count: None, is_video: true, @@ -884,12 +848,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCwdy-QmH4y-gqjC8PMbKVVg", + ArtistId( + id: Some("UCwdy-QmH4y-gqjC8PMbKVVg"), name: "Olexesh", ), ], - artists_txt: Some("Olexesh"), album: None, view_count: None, is_video: true, @@ -907,16 +870,15 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCZHCkx-08zBqSD1A1C5TWrA", + ArtistId( + id: Some("UCZHCkx-08zBqSD1A1C5TWrA"), name: "RAF Camora", ), - ChannelId( - id: "UC8gxc2fYnL1tHPOXHXyI6sQ", + ArtistId( + id: Some("UC8gxc2fYnL1tHPOXHXyI6sQ"), name: "Bonez MC", ), ], - artists_txt: Some("RAF Camora & Bonez MC"), album: None, view_count: None, is_video: true, @@ -934,12 +896,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCmhABfwtPqVfEcn0aKpMRaw", + ArtistId( + id: Some("UCmhABfwtPqVfEcn0aKpMRaw"), name: "Veysel", ), ], - artists_txt: Some("Veysel"), album: None, view_count: None, is_video: true, @@ -957,12 +918,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCFTcSVPYRWlDoHisR-ZKwgw", + ArtistId( + id: Some("UCFTcSVPYRWlDoHisR-ZKwgw"), name: "Vanessa Mai", ), ], - artists_txt: Some("Vanessa Mai"), album: None, view_count: None, is_video: true, @@ -980,12 +940,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCE7_p3lcXA-YXRZp2PjrgYw", + ArtistId( + id: Some("UCE7_p3lcXA-YXRZp2PjrgYw"), name: "Helene Fischer", ), ], - artists_txt: Some("Helene Fischer"), album: None, view_count: None, is_video: true, @@ -1003,12 +962,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC2IxXopNUjjBCC78s_01mnw", + ArtistId( + id: Some("UC2IxXopNUjjBCC78s_01mnw"), name: "Falco", ), ], - artists_txt: Some("Falco"), album: None, view_count: None, is_video: true, @@ -1026,12 +984,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCVRREKn7V1Cb8qvf43dwZ6w", + ArtistId( + id: Some("UCVRREKn7V1Cb8qvf43dwZ6w"), name: "257ers", ), ], - artists_txt: Some("257ers"), album: None, view_count: None, is_video: true, @@ -1049,12 +1006,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCAbxL0lZcmlaQrzoUbrvS3A", + ArtistId( + id: Some("UCAbxL0lZcmlaQrzoUbrvS3A"), name: "SDP", ), ], - artists_txt: Some("SDP"), album: None, view_count: None, is_video: true, @@ -1072,12 +1028,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCKcDBfdLPF3_d0ZzeiCeaSg", + ArtistId( + id: Some("UCKcDBfdLPF3_d0ZzeiCeaSg"), name: "Seeed", ), ], - artists_txt: Some("Seeed"), album: None, view_count: None, is_video: true, @@ -1095,12 +1050,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCkQRXVZuBMktEdVyptoUgGg", + ArtistId( + id: Some("UCkQRXVZuBMktEdVyptoUgGg"), name: "Mark Forster", ), ], - artists_txt: Some("Mark Forster"), album: None, view_count: None, is_video: true, @@ -1118,16 +1072,15 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCrKtmz26qlXIqlR0CH1vr_g", + ArtistId( + id: Some("UCrKtmz26qlXIqlR0CH1vr_g"), name: "Koby Funk", ), - ChannelId( - id: "UCyRQa8Azw8K6ISSd4INDGjQ", + ArtistId( + id: Some("UCyRQa8Azw8K6ISSd4INDGjQ"), name: "Gestört aber GeiL", ), ], - artists_txt: Some("Koby Funk & Gestört aber GeiL"), album: None, view_count: None, is_video: true, @@ -1145,12 +1098,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCwEIiKCL4YYnYUnkc3w418w", + ArtistId( + id: Some("UCwEIiKCL4YYnYUnkc3w418w"), name: "CRO", ), ], - artists_txt: Some("CRO"), album: None, view_count: None, is_video: true, @@ -1168,12 +1120,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCa7FGSUsN2wNRUclibmicMg", + ArtistId( + id: Some("UCa7FGSUsN2wNRUclibmicMg"), name: "Capital Bra", ), ], - artists_txt: Some("Capital Bra"), album: None, view_count: None, is_video: true, @@ -1191,12 +1142,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCtsP_mr458_eETZOrRVgDCg", + ArtistId( + id: Some("UCtsP_mr458_eETZOrRVgDCg"), name: "Jupiter Jones", ), ], - artists_txt: Some("Jupiter Jones"), album: None, view_count: None, is_video: true, @@ -1214,12 +1164,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCiwL2PwE5oWPDFL6Twq904Q", + ArtistId( + id: Some("UCiwL2PwE5oWPDFL6Twq904Q"), name: "Andreas Bourani", ), ], - artists_txt: Some("Andreas Bourani"), album: None, view_count: None, is_video: true, @@ -1237,12 +1186,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCR5tGRQZrS7GpImwYUj_Drg", + ArtistId( + id: Some("UCR5tGRQZrS7GpImwYUj_Drg"), name: "Andreas Gabalier", ), ], - artists_txt: Some("Andreas Gabalier"), album: None, view_count: None, is_video: true, @@ -1260,12 +1208,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCZHCkx-08zBqSD1A1C5TWrA", + ArtistId( + id: Some("UCZHCkx-08zBqSD1A1C5TWrA"), name: "RAF Camora", ), ], - artists_txt: Some("RAF Camora"), album: None, view_count: None, is_video: true, @@ -1283,12 +1230,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCuA6k6g0Xzf6-JlgMXSSA0g", + ArtistId( + id: Some("UCuA6k6g0Xzf6-JlgMXSSA0g"), name: "Ufo361", ), ], - artists_txt: Some("Ufo361"), album: None, view_count: None, is_video: true, @@ -1306,16 +1252,15 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCmhABfwtPqVfEcn0aKpMRaw", + ArtistId( + id: Some("UCmhABfwtPqVfEcn0aKpMRaw"), name: "Veysel", ), - ChannelId( - id: "UCBI6li04V1aWOFrs9jjPomQ", + ArtistId( + id: Some("UCBI6li04V1aWOFrs9jjPomQ"), name: "Mozzik", ), ], - artists_txt: Some("Veysel & Mozzik"), album: None, view_count: None, is_video: true, @@ -1333,12 +1278,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCCirWHa1TzMlpaXzcn_tGdw", + ArtistId( + id: Some("UCCirWHa1TzMlpaXzcn_tGdw"), name: "Kool Savas", ), ], - artists_txt: Some("Kool Savas"), album: None, view_count: None, is_video: true, @@ -1356,12 +1300,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCyavaV4GE4o3jW1X4k55fLA", + ArtistId( + id: Some("UCyavaV4GE4o3jW1X4k55fLA"), name: "Bushido", ), ], - artists_txt: Some("Bushido"), album: None, view_count: None, is_video: true, @@ -1379,12 +1322,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCuNyvmBfTzQZmWI2rsVX3QQ", + ArtistId( + id: Some("UCuNyvmBfTzQZmWI2rsVX3QQ"), name: "Alligatoah", ), ], - artists_txt: Some("Alligatoah"), album: None, view_count: None, is_video: true, @@ -1402,12 +1344,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC4Uo6C43HtCJ1yGeUuCtIsA", + ArtistId( + id: Some("UC4Uo6C43HtCJ1yGeUuCtIsA"), name: "187 Strassenbande", ), ], - artists_txt: Some("187 Strassenbande"), album: None, view_count: None, is_video: true, @@ -1425,12 +1366,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCkQRXVZuBMktEdVyptoUgGg", + ArtistId( + id: Some("UCkQRXVZuBMktEdVyptoUgGg"), name: "Mark Forster", ), ], - artists_txt: Some("Mark Forster"), album: None, view_count: None, is_video: true, @@ -1448,12 +1388,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC765Orc9dupeXxykaXpdQFw", + ArtistId( + id: Some("UC765Orc9dupeXxykaXpdQFw"), name: "Anna-Maria Zimmermann", ), ], - artists_txt: Some("Anna-Maria Zimmermann"), album: None, view_count: None, is_video: true, @@ -1471,12 +1410,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCAbxL0lZcmlaQrzoUbrvS3A", + ArtistId( + id: Some("UCAbxL0lZcmlaQrzoUbrvS3A"), name: "SDP", ), ], - artists_txt: Some("SDP"), album: None, view_count: None, is_video: true, @@ -1494,12 +1432,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCozHZjJVp3FcLPlTVL1oUnA", + ArtistId( + id: Some("UCozHZjJVp3FcLPlTVL1oUnA"), name: "Wolkenfrei", ), ], - artists_txt: Some("Wolkenfrei"), album: None, view_count: None, is_video: true, @@ -1517,12 +1454,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCIxzmOKFBzdWaK95Q9xcVGw", + ArtistId( + id: Some("UCIxzmOKFBzdWaK95Q9xcVGw"), name: "Ali As", ), ], - artists_txt: Some("Ali As"), album: None, view_count: None, is_video: true, @@ -1540,12 +1476,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCR5VDjhUCi0FYr4f-3Zd9Bw", + ArtistId( + id: Some("UCR5VDjhUCi0FYr4f-3Zd9Bw"), name: "Frei.Wild", ), ], - artists_txt: Some("Frei.Wild"), album: None, view_count: None, is_video: true, @@ -1563,12 +1498,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCXUNYorrTVi7iG5FUnr-Gbg", + ArtistId( + id: Some("UCXUNYorrTVi7iG5FUnr-Gbg"), name: "Azet", ), ], - artists_txt: Some("Azet"), album: None, view_count: None, is_video: true, @@ -1586,12 +1520,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC_MxOdawj_BStPs4CKBYD0Q", + ArtistId( + id: Some("UC_MxOdawj_BStPs4CKBYD0Q"), name: "LEA", ), ], - artists_txt: Some("LEA"), album: None, view_count: None, is_video: true, @@ -1609,12 +1542,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCyavaV4GE4o3jW1X4k55fLA", + ArtistId( + id: Some("UCyavaV4GE4o3jW1X4k55fLA"), name: "Bushido", ), ], - artists_txt: Some("Bushido"), album: None, view_count: None, is_video: true, @@ -1632,12 +1564,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC-fcAnS3bwGkrfpLSv-0Dag", + ArtistId( + id: Some("UC-fcAnS3bwGkrfpLSv-0Dag"), name: "Klubbb3", ), ], - artists_txt: Some("Klubbb3"), album: None, view_count: None, is_video: true, @@ -1655,12 +1586,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCyavaV4GE4o3jW1X4k55fLA", + ArtistId( + id: Some("UCyavaV4GE4o3jW1X4k55fLA"), name: "Bushido", ), ], - artists_txt: Some("Bushido"), album: None, view_count: None, is_video: true, @@ -1678,12 +1608,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCxaovR9-q1-mDpwqB9PbXZA", + ArtistId( + id: Some("UCxaovR9-q1-mDpwqB9PbXZA"), name: "Söhne Mannheims", ), ], - artists_txt: Some("Söhne Mannheims"), album: None, view_count: None, is_video: true, @@ -1701,12 +1630,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCwoO85C8_Pzq-2ek7x53Y9Q", + ArtistId( + id: Some("UCwoO85C8_Pzq-2ek7x53Y9Q"), name: "Philipp Poisel", ), ], - artists_txt: Some("Philipp Poisel"), album: None, view_count: None, is_video: true, @@ -1724,12 +1652,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCymtzNvoLbYPhnZbd2CcCZA", + ArtistId( + id: Some("UCymtzNvoLbYPhnZbd2CcCZA"), name: "Mike Singer", ), ], - artists_txt: Some("Mike Singer"), album: None, view_count: None, is_video: true, @@ -1747,12 +1674,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCE8BWpRTOxclDmpqf9Zlq8w", + ArtistId( + id: Some("UCE8BWpRTOxclDmpqf9Zlq8w"), name: "JORIS", ), ], - artists_txt: Some("JORIS"), album: None, view_count: None, is_video: true, @@ -1770,12 +1696,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCACOVSEb3DGote2ZHZx6jHw", + ArtistId( + id: Some("UCACOVSEb3DGote2ZHZx6jHw"), name: "KC Rebell", ), ], - artists_txt: Some("KC Rebell"), album: None, view_count: None, is_video: true, @@ -1793,12 +1718,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCcgml_Q7npEKVGM2bSksWBA", + ArtistId( + id: Some("UCcgml_Q7npEKVGM2bSksWBA"), name: "Tim Bendzko", ), ], - artists_txt: Some("Tim Bendzko"), album: None, view_count: None, is_video: true, @@ -1816,12 +1740,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC9N-YBlbrSGyM8DeAlv717g", + ArtistId( + id: Some("UC9N-YBlbrSGyM8DeAlv717g"), name: "Casper", ), ], - artists_txt: Some("Casper"), album: None, view_count: None, is_video: true, @@ -1839,12 +1762,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCuNyvmBfTzQZmWI2rsVX3QQ", + ArtistId( + id: Some("UCuNyvmBfTzQZmWI2rsVX3QQ"), name: "Alligatoah", ), ], - artists_txt: Some("Alligatoah"), album: None, view_count: None, is_video: true, @@ -1862,12 +1784,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCZwxolUWIeUty9Ru39pKNIw", + ArtistId( + id: Some("UCZwxolUWIeUty9Ru39pKNIw"), name: "Revolverheld", ), ], - artists_txt: Some("Revolverheld"), album: None, view_count: None, is_video: true, @@ -1885,12 +1806,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCK2ZLsY9Mb_dxZiZfKE3lGg", + ArtistId( + id: Some("UCK2ZLsY9Mb_dxZiZfKE3lGg"), name: "AnnenMayKantereit", ), ], - artists_txt: Some("AnnenMayKantereit"), album: None, view_count: None, is_video: true, @@ -1908,12 +1828,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCZeK8mXLSQV4wJ7IjOfgtwQ", + ArtistId( + id: Some("UCZeK8mXLSQV4wJ7IjOfgtwQ"), name: "Capo", ), ], - artists_txt: Some("Capo"), album: None, view_count: None, is_video: true, @@ -1931,12 +1850,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC3qkJTPxKEp8TOf0V8M8_dw", + ArtistId( + id: Some("UC3qkJTPxKEp8TOf0V8M8_dw"), name: "Die Lochis", ), ], - artists_txt: Some("Die Lochis"), album: None, view_count: None, is_video: true, @@ -1954,12 +1872,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCZeK8mXLSQV4wJ7IjOfgtwQ", + ArtistId( + id: Some("UCZeK8mXLSQV4wJ7IjOfgtwQ"), name: "Capo", ), ], - artists_txt: Some("Capo"), album: None, view_count: None, is_video: true, @@ -1977,12 +1894,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCXGYZ-OhdOpPBamHX3K9YRg", + ArtistId( + id: Some("UCXGYZ-OhdOpPBamHX3K9YRg"), name: "Joel Brandenstein", ), ], - artists_txt: Some("Joel Brandenstein"), album: None, view_count: None, is_video: true, @@ -2000,12 +1916,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCXDkh6v5SI-Y5W-9nGcV8FA", + ArtistId( + id: Some("UCXDkh6v5SI-Y5W-9nGcV8FA"), name: "Wincent Weiss", ), ], - artists_txt: Some("Wincent Weiss"), album: None, view_count: None, is_video: true, @@ -2023,12 +1938,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCKcDBfdLPF3_d0ZzeiCeaSg", + ArtistId( + id: Some("UCKcDBfdLPF3_d0ZzeiCeaSg"), name: "Seeed", ), ], - artists_txt: Some("Seeed"), album: None, view_count: None, is_video: true, @@ -2046,12 +1960,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCKcDBfdLPF3_d0ZzeiCeaSg", + ArtistId( + id: Some("UCKcDBfdLPF3_d0ZzeiCeaSg"), name: "Seeed", ), ], - artists_txt: Some("Seeed"), album: None, view_count: None, is_video: true, @@ -2069,12 +1982,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCACOVSEb3DGote2ZHZx6jHw", + ArtistId( + id: Some("UCACOVSEb3DGote2ZHZx6jHw"), name: "KC Rebell", ), ], - artists_txt: Some("KC Rebell"), album: None, view_count: None, is_video: true, @@ -2092,12 +2004,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCJjgJI2vEDxGZYbQ_-2ZGXQ", + ArtistId( + id: Some("UCJjgJI2vEDxGZYbQ_-2ZGXQ"), name: "Adel Tawil", ), ], - artists_txt: Some("Adel Tawil"), album: None, view_count: None, is_video: true, @@ -2115,12 +2026,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCAbxL0lZcmlaQrzoUbrvS3A", + ArtistId( + id: Some("UCAbxL0lZcmlaQrzoUbrvS3A"), name: "SDP", ), ], - artists_txt: Some("SDP"), album: None, view_count: None, is_video: true, @@ -2138,12 +2048,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCwoO85C8_Pzq-2ek7x53Y9Q", + ArtistId( + id: Some("UCwoO85C8_Pzq-2ek7x53Y9Q"), name: "Philipp Poisel", ), ], - artists_txt: Some("Philipp Poisel"), album: None, view_count: None, is_video: true, @@ -2161,12 +2070,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCvvMm92fPNQNRj54GTPV6UQ", + ArtistId( + id: Some("UCvvMm92fPNQNRj54GTPV6UQ"), name: "Xavier Naidoo", ), ], - artists_txt: Some("Xavier Naidoo"), album: None, view_count: None, is_video: true, @@ -2184,12 +2092,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCuNyvmBfTzQZmWI2rsVX3QQ", + ArtistId( + id: Some("UCuNyvmBfTzQZmWI2rsVX3QQ"), name: "Alligatoah", ), ], - artists_txt: Some("Alligatoah"), album: None, view_count: None, is_video: true, @@ -2207,16 +2114,15 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCLmyWpIwbKr6HJQ_teYCkVw", + ArtistId( + id: Some("UCLmyWpIwbKr6HJQ_teYCkVw"), name: "Kollegah", ), - ChannelId( - id: "UC4gi504gkSyoXt9vfaGUr9A", + ArtistId( + id: Some("UC4gi504gkSyoXt9vfaGUr9A"), name: "Farid Bang", ), ], - artists_txt: Some("Kollegah & Farid Bang"), album: None, view_count: None, is_video: true, @@ -2234,12 +2140,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCAbxL0lZcmlaQrzoUbrvS3A", + ArtistId( + id: Some("UCAbxL0lZcmlaQrzoUbrvS3A"), name: "SDP", ), ], - artists_txt: Some("SDP"), album: None, view_count: None, is_video: true, @@ -2257,12 +2162,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCFNSyezyK_1_f0nOrNaCdHQ", + ArtistId( + id: Some("UCFNSyezyK_1_f0nOrNaCdHQ"), name: "SXTN", ), ], - artists_txt: Some("SXTN"), album: None, view_count: None, is_video: true, @@ -2280,12 +2184,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCVz_BF7bR39KN0gK8gG3knA", + ArtistId( + id: Some("UCVz_BF7bR39KN0gK8gG3knA"), name: "House Rockerz", ), ], - artists_txt: Some("House Rockerz"), album: None, view_count: None, is_video: true, @@ -2303,12 +2206,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCVvL70F5a_APtKzTjGb2L0w", + ArtistId( + id: Some("UCVvL70F5a_APtKzTjGb2L0w"), name: "Gzuz", ), ], - artists_txt: Some("Gzuz"), album: None, view_count: None, is_video: true, @@ -2326,12 +2228,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCcgml_Q7npEKVGM2bSksWBA", + ArtistId( + id: Some("UCcgml_Q7npEKVGM2bSksWBA"), name: "Tim Bendzko", ), ], - artists_txt: Some("Tim Bendzko"), album: None, view_count: None, is_video: true, @@ -2349,16 +2250,15 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCZHCkx-08zBqSD1A1C5TWrA", + ArtistId( + id: Some("UCZHCkx-08zBqSD1A1C5TWrA"), name: "RAF Camora", ), - ChannelId( - id: "UC8gxc2fYnL1tHPOXHXyI6sQ", + ArtistId( + id: Some("UC8gxc2fYnL1tHPOXHXyI6sQ"), name: "Bonez MC", ), ], - artists_txt: Some("RAF Camora & Bonez MC"), album: None, view_count: None, is_video: true, diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_nomusic.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_nomusic.snap index c786be2..b76344a 100644 --- a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_nomusic.snap +++ b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_nomusic.snap @@ -43,8 +43,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -61,8 +65,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -79,8 +87,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -97,8 +109,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -115,8 +131,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -133,8 +153,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -151,8 +175,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -169,8 +197,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -187,8 +219,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -205,8 +241,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -223,8 +263,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -241,8 +285,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -259,8 +307,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -277,8 +329,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -295,8 +351,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -313,8 +373,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -331,8 +395,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -349,8 +417,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -367,8 +439,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -385,8 +461,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -403,8 +483,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -421,8 +505,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -439,8 +527,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -457,8 +549,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -475,8 +571,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -493,8 +593,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -511,8 +615,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -529,8 +637,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -547,8 +659,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -565,8 +681,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -583,8 +703,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -601,8 +725,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -619,8 +747,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -637,8 +769,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -655,8 +791,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -673,8 +813,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -691,8 +835,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -709,8 +857,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -727,8 +879,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -745,8 +901,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -763,8 +923,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -781,8 +945,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -799,8 +967,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -817,8 +989,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -835,8 +1011,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -853,8 +1033,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -871,8 +1055,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -889,8 +1077,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -907,8 +1099,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -925,8 +1121,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -943,8 +1143,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -961,8 +1165,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -979,8 +1187,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -997,8 +1209,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -1015,8 +1231,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -1033,8 +1253,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -1051,8 +1275,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -1069,8 +1297,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -1087,8 +1319,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -1105,8 +1341,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -1123,8 +1363,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -1141,8 +1385,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -1159,8 +1407,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -1177,8 +1429,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -1195,8 +1451,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, @@ -1213,8 +1473,12 @@ MusicPlaylist( height: 225, ), ], - artists: [], - artists_txt: Some("Chaosflo44"), + artists: [ + ArtistId( + id: None, + name: "Chaosflo44", + ), + ], album: None, view_count: None, is_video: true, diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_short.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_short.snap index 25100f3..2cbb148 100644 --- a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_short.snap +++ b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_short.snap @@ -46,12 +46,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCvWtix2TtWGe9kffqnwdaMw", + ArtistId( + id: Some("UCvWtix2TtWGe9kffqnwdaMw"), name: "Rihanna", ), ], - artists_txt: Some("Rihanna"), album: None, view_count: None, is_video: true, @@ -69,12 +68,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCxrxwFTBU3DTJ9Y5TKeW7KA", + ArtistId( + id: Some("UCxrxwFTBU3DTJ9Y5TKeW7KA"), name: "Lewis Capaldi", ), ], - artists_txt: Some("Lewis Capaldi"), album: None, view_count: None, is_video: true, @@ -92,12 +90,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCxbXb4XdmfbYPjCH80ilOMQ", + ArtistId( + id: Some("UCxbXb4XdmfbYPjCH80ilOMQ"), name: "Sofia Carson", ), ], - artists_txt: Some("Sofia Carson"), album: None, view_count: None, is_video: true, @@ -115,12 +112,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UClmXPfaYhXOYsNn_QUyheWQ", + ArtistId( + id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), name: "Ed Sheeran", ), ], - artists_txt: Some("Ed Sheeran"), album: None, view_count: None, is_video: true, @@ -138,12 +134,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UChN7Bcek6HoXA-j8K8T7olQ", + ArtistId( + id: Some("UChN7Bcek6HoXA-j8K8T7olQ"), name: "Benson Boone", ), ], - artists_txt: Some("Benson Boone"), album: None, view_count: None, is_video: true, @@ -161,12 +156,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCc7qv30nl6n6ZLP8TWDKjAw", + ArtistId( + id: Some("UCc7qv30nl6n6ZLP8TWDKjAw"), name: "Owl City", ), ], - artists_txt: Some("Owl City"), album: None, view_count: None, is_video: true, @@ -184,12 +178,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCERrDZ8oN0U_n9MphMKERcg", + ArtistId( + id: Some("UCERrDZ8oN0U_n9MphMKERcg"), name: "Billie Eilish", ), ], - artists_txt: Some("Billie Eilish"), album: None, view_count: None, is_video: true, @@ -207,12 +200,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCz51ZodJbYUNfkdPHOjJKKw", + ArtistId( + id: Some("UCz51ZodJbYUNfkdPHOjJKKw"), name: "Sabrina Carpenter", ), ], - artists_txt: Some("Sabrina Carpenter"), album: None, view_count: None, is_video: true, @@ -230,12 +222,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCCj0RlDqqahEB5BXVtDcPqg", + ArtistId( + id: Some("UCCj0RlDqqahEB5BXVtDcPqg"), name: "5 Seconds of Summer", ), ], - artists_txt: Some("5 Seconds of Summer"), album: None, view_count: None, is_video: true, @@ -253,12 +244,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCiDBtu8whAdUgiJ5o1g7sQQ", + ArtistId( + id: Some("UCiDBtu8whAdUgiJ5o1g7sQQ"), name: "James Bay", ), ], - artists_txt: Some("James Bay"), album: None, view_count: None, is_video: true, @@ -276,12 +266,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UClmXPfaYhXOYsNn_QUyheWQ", + ArtistId( + id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), name: "Ed Sheeran", ), ], - artists_txt: Some("Ed Sheeran"), album: None, view_count: None, is_video: true, @@ -299,12 +288,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCEiu8KxYtwFeuivzBYREn3Q", + ArtistId( + id: Some("UCEiu8KxYtwFeuivzBYREn3Q"), name: "Michele Morrone", ), ], - artists_txt: Some("Michele Morrone"), album: None, view_count: None, is_video: true, @@ -322,12 +310,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCcCMlnsPEBCBIHQxI_NJEYg", + ArtistId( + id: Some("UCcCMlnsPEBCBIHQxI_NJEYg"), name: "Andy Grammer", ), ], - artists_txt: Some("Andy Grammer"), album: None, view_count: None, is_video: true, @@ -345,12 +332,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCCK1-D6wWlRuQgaCdIAKsMA", + ArtistId( + id: Some("UCCK1-D6wWlRuQgaCdIAKsMA"), name: "Jaymes Young", ), ], - artists_txt: Some("Jaymes Young"), album: None, view_count: None, is_video: true, @@ -368,12 +354,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCNAbUat5xDtp6FeBphe2V_Q", + ArtistId( + id: Some("UCNAbUat5xDtp6FeBphe2V_Q"), name: "James Arthur", ), ], - artists_txt: Some("James Arthur"), album: None, view_count: None, is_video: true, @@ -391,12 +376,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCySKHMJ31dcWmdOUyMQUJPQ", + ArtistId( + id: Some("UCySKHMJ31dcWmdOUyMQUJPQ"), name: "Jess Glynne", ), ], - artists_txt: Some("Jess Glynne"), album: None, view_count: None, is_video: true, @@ -414,12 +398,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UClmXPfaYhXOYsNn_QUyheWQ", + ArtistId( + id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), name: "Ed Sheeran", ), ], - artists_txt: Some("Ed Sheeran"), album: None, view_count: None, is_video: true, @@ -437,12 +420,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCEiu8KxYtwFeuivzBYREn3Q", + ArtistId( + id: Some("UCEiu8KxYtwFeuivzBYREn3Q"), name: "Michele Morrone", ), ], - artists_txt: Some("Michele Morrone"), album: None, view_count: None, is_video: true, @@ -460,12 +442,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCrrbm1toLPud8fFIisPuxpg", + ArtistId( + id: Some("UCrrbm1toLPud8fFIisPuxpg"), name: "OneRepublic", ), ], - artists_txt: Some("OneRepublic"), album: None, view_count: None, is_video: true, @@ -483,12 +464,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCdFe4KkWwZ_twpo-UECR-Nw", + ArtistId( + id: Some("UCdFe4KkWwZ_twpo-UECR-Nw"), name: "Maroon 5", ), ], - artists_txt: Some("Maroon 5"), album: None, view_count: None, is_video: true, @@ -506,12 +486,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCZyvQjTvS_1fiCaz-cU9luA", + ArtistId( + id: Some("UCZyvQjTvS_1fiCaz-cU9luA"), name: "Counting Crows", ), ], - artists_txt: Some("Counting Crows"), album: None, view_count: None, is_video: true, @@ -529,12 +508,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCdcOKli0OmBrQUVfCqHy7PQ", + ArtistId( + id: Some("UCdcOKli0OmBrQUVfCqHy7PQ"), name: "Giveon", ), ], - artists_txt: Some("Giveon"), album: None, view_count: None, is_video: true, @@ -552,12 +530,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC8v5OGljUo7ATs_14mm-aQw", + ArtistId( + id: Some("UC8v5OGljUo7ATs_14mm-aQw"), name: "Birdy", ), ], - artists_txt: Some("Birdy"), album: None, view_count: None, is_video: true, @@ -575,12 +552,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UClHxZy_9ArA6rploIzcDReQ", + ArtistId( + id: Some("UClHxZy_9ArA6rploIzcDReQ"), name: "Dermot Kennedy", ), ], - artists_txt: Some("Dermot Kennedy"), album: None, view_count: None, is_video: true, @@ -598,12 +574,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCrrbm1toLPud8fFIisPuxpg", + ArtistId( + id: Some("UCrrbm1toLPud8fFIisPuxpg"), name: "OneRepublic", ), ], - artists_txt: Some("OneRepublic"), album: None, view_count: None, is_video: true, @@ -621,12 +596,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCDfnnzgPNShOXOYM9V4QIsQ", + ArtistId( + id: Some("UCDfnnzgPNShOXOYM9V4QIsQ"), name: "Conan Gray", ), ], - artists_txt: Some("Conan Gray"), album: None, view_count: None, is_video: true, @@ -644,12 +618,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCIaFw5VBEK8qaW6nRpx_qnw", + ArtistId( + id: Some("UCIaFw5VBEK8qaW6nRpx_qnw"), name: "Coldplay", ), ], - artists_txt: Some("Coldplay"), album: None, view_count: None, is_video: true, @@ -667,12 +640,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC7wYAi5loaBGEbOQz7VBF2w", + ArtistId( + id: Some("UC7wYAi5loaBGEbOQz7VBF2w"), name: "John Legend", ), ], - artists_txt: Some("John Legend"), album: None, view_count: None, is_video: true, @@ -690,12 +662,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCuCDEKaRwc9nGFnh_EwytNw", + ArtistId( + id: Some("UCuCDEKaRwc9nGFnh_EwytNw"), name: "Jessie Murph", ), ], - artists_txt: Some("Jessie Murph"), album: None, view_count: None, is_video: true, @@ -713,12 +684,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCxm9sS8Dd2aRthr_O3rVLJQ", + ArtistId( + id: Some("UCxm9sS8Dd2aRthr_O3rVLJQ"), name: "Niall Horan", ), ], - artists_txt: Some("Niall Horan"), album: None, view_count: None, is_video: true, @@ -736,16 +706,15 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCz86IA7ooUetFnUGa_YlsVw", + ArtistId( + id: Some("UCz86IA7ooUetFnUGa_YlsVw"), name: "Tate McRae", ), - ChannelId( - id: "UCF5FLb0R-oJ5W_5bPlUd6mw", + ArtistId( + id: Some("UCF5FLb0R-oJ5W_5bPlUd6mw"), name: "Ali Gatie", ), ], - artists_txt: Some("Tate McRae & Ali Gatie"), album: None, view_count: None, is_video: true, @@ -763,12 +732,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCDfnnzgPNShOXOYM9V4QIsQ", + ArtistId( + id: Some("UCDfnnzgPNShOXOYM9V4QIsQ"), name: "Conan Gray", ), ], - artists_txt: Some("Conan Gray"), album: None, view_count: None, is_video: true, @@ -786,12 +754,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCREdEwBdZcnQLIT0ThaAtmQ", + ArtistId( + id: Some("UCREdEwBdZcnQLIT0ThaAtmQ"), name: "Miley Cyrus", ), ], - artists_txt: Some("Miley Cyrus"), album: None, view_count: None, is_video: true, @@ -809,16 +776,15 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCoXUei82oXmv4HJW4of7KuA", + ArtistId( + id: Some("UCoXUei82oXmv4HJW4of7KuA"), name: "Rosa Linn", ), - ChannelId( - id: "UCBa6lSIB_gX6IuOQlrqRvkg", + ArtistId( + id: Some("UCBa6lSIB_gX6IuOQlrqRvkg"), name: "Duncan Laurence", ), ], - artists_txt: Some("Rosa Linn & Duncan Laurence"), album: None, view_count: None, is_video: true, @@ -836,12 +802,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCFTEZcsMSOzX6tZOGwkS-xw", + ArtistId( + id: Some("UCFTEZcsMSOzX6tZOGwkS-xw"), name: "James Morrison", ), ], - artists_txt: Some("James Morrison"), album: None, view_count: None, is_video: true, @@ -859,12 +824,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCxm9sS8Dd2aRthr_O3rVLJQ", + ArtistId( + id: Some("UCxm9sS8Dd2aRthr_O3rVLJQ"), name: "Niall Horan", ), ], - artists_txt: Some("Niall Horan"), album: None, view_count: None, is_video: true, @@ -882,12 +846,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCJWJd67r42sByfpOe6S__zw", + ArtistId( + id: Some("UCJWJd67r42sByfpOe6S__zw"), name: "Michael Bublé", ), ], - artists_txt: Some("Michael Bublé"), album: None, view_count: None, is_video: true, @@ -905,12 +868,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UChN7Bcek6HoXA-j8K8T7olQ", + ArtistId( + id: Some("UChN7Bcek6HoXA-j8K8T7olQ"), name: "Benson Boone", ), ], - artists_txt: Some("Benson Boone"), album: None, view_count: None, is_video: true, @@ -928,12 +890,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCx00XxqRCfPS6zaTzRm3H2A", + ArtistId( + id: Some("UCx00XxqRCfPS6zaTzRm3H2A"), name: "a-ha", ), ], - artists_txt: Some("a-ha"), album: None, view_count: None, is_video: true, @@ -951,12 +912,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCrrbm1toLPud8fFIisPuxpg", + ArtistId( + id: Some("UCrrbm1toLPud8fFIisPuxpg"), name: "OneRepublic", ), ], - artists_txt: Some("OneRepublic"), album: None, view_count: None, is_video: true, @@ -974,12 +934,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UClHxZy_9ArA6rploIzcDReQ", + ArtistId( + id: Some("UClHxZy_9ArA6rploIzcDReQ"), name: "Dermot Kennedy", ), ], - artists_txt: Some("Dermot Kennedy"), album: None, view_count: None, is_video: true, @@ -997,12 +956,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCXsen2Eqwx-Et8OsB4WAWpQ", + ArtistId( + id: Some("UCXsen2Eqwx-Et8OsB4WAWpQ"), name: "Sigrid", ), ], - artists_txt: Some("Sigrid"), album: None, view_count: None, is_video: true, @@ -1020,16 +978,15 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCnK1mlWb6zp7AQfCpseJ4Qg", + ArtistId( + id: Some("UCnK1mlWb6zp7AQfCpseJ4Qg"), name: "MAX", ), - ChannelId( - id: "UCF5FLb0R-oJ5W_5bPlUd6mw", + ArtistId( + id: Some("UCF5FLb0R-oJ5W_5bPlUd6mw"), name: "Ali Gatie", ), ], - artists_txt: Some("MAX & Ali Gatie"), album: None, view_count: None, is_video: true, @@ -1052,12 +1009,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UClmXPfaYhXOYsNn_QUyheWQ", + ArtistId( + id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), name: "Ed Sheeran", ), ], - artists_txt: Some("Ed Sheeran"), album: Some(AlbumId( id: "MPREb_occn8N7bcNt", name: "The Hobbit - The Desolation Of Smaug (Original Motion Picture Soundtrack / Special Edition)", @@ -1078,12 +1034,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCCEzq-Gv6gU-bdM82rtZN4g", + ArtistId( + id: Some("UCCEzq-Gv6gU-bdM82rtZN4g"), name: "James Blunt", ), ], - artists_txt: Some("James Blunt"), album: None, view_count: None, is_video: true, @@ -1101,12 +1056,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCgpBsaDW2n_6ruzht3wvP0A", + ArtistId( + id: Some("UCgpBsaDW2n_6ruzht3wvP0A"), name: "Sam Smith", ), ], - artists_txt: Some("Sam Smith"), album: None, view_count: None, is_video: true, @@ -1124,12 +1078,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCWEOCbdtQTQeQ4C2u7q5nhw", + ArtistId( + id: Some("UCWEOCbdtQTQeQ4C2u7q5nhw"), name: "Family of the Year", ), ], - artists_txt: Some("Family of the Year"), album: None, view_count: None, is_video: true, @@ -1147,12 +1100,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCJ1CS4AJjBGFflRZdKEPw1g", + ArtistId( + id: Some("UCJ1CS4AJjBGFflRZdKEPw1g"), name: "James TW", ), ], - artists_txt: Some("James TW"), album: None, view_count: None, is_video: true, @@ -1170,12 +1122,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC1gXK5ZV0phthXSPLZLC9-g", + ArtistId( + id: Some("UC1gXK5ZV0phthXSPLZLC9-g"), name: "David Kushner", ), ], - artists_txt: Some("David Kushner"), album: None, view_count: None, is_video: true, @@ -1193,12 +1144,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCmosdTllvZCyIii6qQVqLuQ", + ArtistId( + id: Some("UCmosdTllvZCyIii6qQVqLuQ"), name: "Gabrielle Aplin", ), ], - artists_txt: Some("Gabrielle Aplin"), album: None, view_count: None, is_video: true, @@ -1216,12 +1166,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCn9CRqI75fDZVpKxP8bH2uA", + ArtistId( + id: Some("UCn9CRqI75fDZVpKxP8bH2uA"), name: "Mimi Webb", ), ], - artists_txt: Some("Mimi Webb"), album: None, view_count: None, is_video: true, @@ -1239,12 +1188,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCndGjZNR8Na72X3KQxmrzlQ", + ArtistId( + id: Some("UCndGjZNR8Na72X3KQxmrzlQ"), name: "Zoe Wees", ), ], - artists_txt: Some("Zoe Wees"), album: None, view_count: None, is_video: true, @@ -1262,12 +1210,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCUekv_6fGLPg2V4Lt2-TxWA", + ArtistId( + id: Some("UCUekv_6fGLPg2V4Lt2-TxWA"), name: "Noah Cyrus", ), ], - artists_txt: Some("Noah Cyrus"), album: None, view_count: None, is_video: true, @@ -1285,12 +1232,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UClHxZy_9ArA6rploIzcDReQ", + ArtistId( + id: Some("UClHxZy_9ArA6rploIzcDReQ"), name: "Dermot Kennedy", ), ], - artists_txt: Some("Dermot Kennedy"), album: None, view_count: None, is_video: true, @@ -1308,12 +1254,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCiY4Bc7zlpBb8ZnETq3QhFQ", + ArtistId( + id: Some("UCiY4Bc7zlpBb8ZnETq3QhFQ"), name: "Ashley Kutcher", ), ], - artists_txt: Some("Ashley Kutcher"), album: None, view_count: None, is_video: true, @@ -1331,12 +1276,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCZXFFOvXl9MxKDdIzcrh_eQ", + ArtistId( + id: Some("UCZXFFOvXl9MxKDdIzcrh_eQ"), name: "Camylio", ), ], - artists_txt: Some("Camylio"), album: None, view_count: None, is_video: true, @@ -1354,12 +1298,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCTVV4ftXytYeCZ8mr9HvLkA", + ArtistId( + id: Some("UCTVV4ftXytYeCZ8mr9HvLkA"), name: "Amy Shark", ), ], - artists_txt: Some("Amy Shark"), album: None, view_count: None, is_video: true, @@ -1377,12 +1320,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC91Bvz_hS8v8FHBZU3Sb6qw", + ArtistId( + id: Some("UC91Bvz_hS8v8FHBZU3Sb6qw"), name: "JP Saxe", ), ], - artists_txt: Some("JP Saxe"), album: None, view_count: None, is_video: true, @@ -1400,16 +1342,15 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC-bE9kenHs2wN-p96ESCFIg", + ArtistId( + id: Some("UC-bE9kenHs2wN-p96ESCFIg"), name: "Julia Michaels", ), - ChannelId( - id: "UCwGXlFP4Ba5do7KoxRJYgVQ", + ArtistId( + id: Some("UCwGXlFP4Ba5do7KoxRJYgVQ"), name: "Noah Kahan", ), ], - artists_txt: Some("Julia Michaels & Noah Kahan"), album: None, view_count: None, is_video: true, @@ -1427,12 +1368,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCiDBtu8whAdUgiJ5o1g7sQQ", + ArtistId( + id: Some("UCiDBtu8whAdUgiJ5o1g7sQQ"), name: "James Bay", ), ], - artists_txt: Some("James Bay"), album: None, view_count: None, is_video: true, @@ -1455,12 +1395,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UClmXPfaYhXOYsNn_QUyheWQ", + ArtistId( + id: Some("UClmXPfaYhXOYsNn_QUyheWQ"), name: "Ed Sheeran", ), ], - artists_txt: Some("Ed Sheeran"), album: Some(AlbumId( id: "MPREb_L6fwH6dF0r0", name: "Bad Habits (Acoustic Version)", @@ -1481,12 +1420,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCLcdzadtYzkPRyCmvj96BDw", + ArtistId( + id: Some("UCLcdzadtYzkPRyCmvj96BDw"), name: "Flora Cash", ), ], - artists_txt: Some("Flora Cash"), album: None, view_count: None, is_video: true, @@ -1504,12 +1442,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCNAbUat5xDtp6FeBphe2V_Q", + ArtistId( + id: Some("UCNAbUat5xDtp6FeBphe2V_Q"), name: "James Arthur", ), ], - artists_txt: Some("James Arthur"), album: None, view_count: None, is_video: true, @@ -1527,12 +1464,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC3_kaldIP4G9nOBaE_u6e6Q", + ArtistId( + id: Some("UC3_kaldIP4G9nOBaE_u6e6Q"), name: "Oh Wonder", ), ], - artists_txt: Some("Oh Wonder"), album: None, view_count: None, is_video: true, @@ -1550,12 +1486,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCo5Hx6tOkjyWHmJDucjtB0A", + ArtistId( + id: Some("UCo5Hx6tOkjyWHmJDucjtB0A"), name: "Ruel", ), ], - artists_txt: Some("Ruel"), album: None, view_count: None, is_video: true, @@ -1573,12 +1508,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCWOoizZfmKq1TtiBx9xBd0g", + ArtistId( + id: Some("UCWOoizZfmKq1TtiBx9xBd0g"), name: "Nina Nesbitt", ), ], - artists_txt: Some("Nina Nesbitt"), album: None, view_count: None, is_video: true, @@ -1596,12 +1530,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC4FxRR1ZZcap_CY6fTQUU3g", + ArtistId( + id: Some("UC4FxRR1ZZcap_CY6fTQUU3g"), name: "Jeremy Zucker", ), ], - artists_txt: Some("Jeremy Zucker"), album: None, view_count: None, is_video: true, @@ -1619,12 +1552,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCiDBtu8whAdUgiJ5o1g7sQQ", + ArtistId( + id: Some("UCiDBtu8whAdUgiJ5o1g7sQQ"), name: "James Bay", ), ], - artists_txt: Some("James Bay"), album: None, view_count: None, is_video: true, @@ -1642,12 +1574,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCzh2UyHyO420UYx1UYEQPBQ", + ArtistId( + id: Some("UCzh2UyHyO420UYx1UYEQPBQ"), name: "Tom Gregory", ), ], - artists_txt: Some("Tom Gregory"), album: None, view_count: None, is_video: true, @@ -1665,12 +1596,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCZ13GpYX5-b3ePvaGM-lWNA", + ArtistId( + id: Some("UCZ13GpYX5-b3ePvaGM-lWNA"), name: "Blue", ), ], - artists_txt: Some("Blue"), album: None, view_count: None, is_video: true, @@ -1688,12 +1618,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCunB7BiOZ7aN6v6TgCp5dRA", + ArtistId( + id: Some("UCunB7BiOZ7aN6v6TgCp5dRA"), name: "Christina Perri", ), ], - artists_txt: Some("Christina Perri"), album: None, view_count: None, is_video: true, @@ -1711,12 +1640,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC7wYAi5loaBGEbOQz7VBF2w", + ArtistId( + id: Some("UC7wYAi5loaBGEbOQz7VBF2w"), name: "John Legend", ), ], - artists_txt: Some("John Legend"), album: None, view_count: None, is_video: true, @@ -1734,12 +1662,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCWfV8HxoaMqkxfTdkG7x7mA", + ArtistId( + id: Some("UCWfV8HxoaMqkxfTdkG7x7mA"), name: "Låpsley", ), ], - artists_txt: Some("Låpsley"), album: None, view_count: None, is_video: true, @@ -1762,12 +1689,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UChrn_YMztVd260beIymFYfQ", + ArtistId( + id: Some("UChrn_YMztVd260beIymFYfQ"), name: "Rhys Lewis", ), ], - artists_txt: Some("Rhys Lewis"), album: Some(AlbumId( id: "MPREb_RbWzjosY075", name: "The Middle", @@ -1788,12 +1714,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCN8aYfV4Em0pc0hxVXBTA-A", + ArtistId( + id: Some("UCN8aYfV4Em0pc0hxVXBTA-A"), name: "Tones and I", ), ], - artists_txt: Some("Tones and I"), album: None, view_count: None, is_video: true, @@ -1811,12 +1736,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UC3_kaldIP4G9nOBaE_u6e6Q", + ArtistId( + id: Some("UC3_kaldIP4G9nOBaE_u6e6Q"), name: "Oh Wonder", ), ], - artists_txt: Some("Oh Wonder"), album: None, view_count: None, is_video: true, @@ -1834,12 +1758,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCTSbqi0xW0G2qyV8fImyntQ", + ArtistId( + id: Some("UCTSbqi0xW0G2qyV8fImyntQ"), name: "Anderson East", ), ], - artists_txt: Some("Anderson East"), album: None, view_count: None, is_video: true, @@ -1857,12 +1780,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCS6sU7ELP0W4pxnTTw78yKg", + ArtistId( + id: Some("UCS6sU7ELP0W4pxnTTw78yKg"), name: "LÉON", ), ], - artists_txt: Some("LÉON"), album: None, view_count: None, is_video: true, @@ -1880,12 +1802,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCqlM8ftKlcvcvxFIHQEJKbQ", + ArtistId( + id: Some("UCqlM8ftKlcvcvxFIHQEJKbQ"), name: "Tom Grennan", ), ], - artists_txt: Some("Tom Grennan"), album: None, view_count: None, is_video: true, @@ -1903,12 +1824,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCdz912kGd604kxSXASTndzQ", + ArtistId( + id: Some("UCdz912kGd604kxSXASTndzQ"), name: "Matt Simons", ), ], - artists_txt: Some("Matt Simons"), album: None, view_count: None, is_video: true, @@ -1931,12 +1851,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCZFA-xBx9hqhuBRbPRsRsSQ", + ArtistId( + id: Some("UCZFA-xBx9hqhuBRbPRsRsSQ"), name: "Loving Caliber", ), ], - artists_txt: Some("Loving Caliber"), album: Some(AlbumId( id: "MPREb_K3ykFlyAtBW", name: "Shivers (Image Of You)", @@ -1962,12 +1881,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCki3ApOca20WtBbsmqBJVpw", + ArtistId( + id: Some("UCki3ApOca20WtBbsmqBJVpw"), name: "Jeanette Biedermann", ), ], - artists_txt: Some("Jeanette Biedermann"), album: Some(AlbumId( id: "MPREb_CqCSbea02Sf", name: "Will You Love Me Tomorrow", @@ -1993,12 +1911,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCFwFmMRTIVhsUtdudux_p4w", + ArtistId( + id: Some("UCFwFmMRTIVhsUtdudux_p4w"), name: "Annett Louisan", ), ], - artists_txt: Some("Annett Louisan"), album: Some(AlbumId( id: "MPREb_SmhIeycMOq4", name: "The Game", @@ -2024,12 +1941,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCzUXY6Hkj5QLKWd8lCx6uBQ", + ArtistId( + id: Some("UCzUXY6Hkj5QLKWd8lCx6uBQ"), name: "Jamie Lawson", ), ], - artists_txt: Some("Jamie Lawson"), album: Some(AlbumId( id: "MPREb_wUbDt2lAYgu", name: "Happy Accidents", @@ -2055,12 +1971,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCgqSlB91jGqWkuym-oNeG9g", + ArtistId( + id: Some("UCgqSlB91jGqWkuym-oNeG9g"), name: "Rag\'n\'Bone Man", ), ], - artists_txt: Some("Rag\'n\'Bone Man"), album: Some(AlbumId( id: "MPREb_9cC8alLLIzQ", name: "Grace (We All Try)", @@ -2086,12 +2001,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCw8lH8JiZRRAnlYRVvktQ7Q", + ArtistId( + id: Some("UCw8lH8JiZRRAnlYRVvktQ7Q"), name: "Janice", ), ], - artists_txt: Some("Janice"), album: Some(AlbumId( id: "MPREb_yKyvKrAPRhT", name: "Don\'t Lay It All On Me", @@ -2117,12 +2031,11 @@ MusicPlaylist( ), ], artists: [ - ChannelId( - id: "UCSnjgxmtbCtpV_eZ2UU7OXQ", + ArtistId( + id: Some("UCSnjgxmtbCtpV_eZ2UU7OXQ"), name: "Glimmer of Blooms", ), ], - artists_txt: Some("Glimmer of Blooms"), album: Some(AlbumId( id: "MPREb_oJNYG7rhfFB", name: "Words as Weapons", diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_albums.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_albums.snap index f63dd62..3a76cac 100644 --- a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_albums.snap +++ b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_albums.snap @@ -32,14 +32,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCEdZAdnnKqbaHOlv8nM6OtA", + ArtistId( + id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), name: "aespa", ), ], - artists_txt: "aespa", album_type: Single, year: Some(2020), + by_va: false, ), AlbumItem( id: "MPREb_pvdHyqvGjbI", @@ -67,14 +67,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCEdZAdnnKqbaHOlv8nM6OtA", + ArtistId( + id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), name: "aespa", ), ], - artists_txt: "aespa", album_type: Album, year: Some(2022), + by_va: false, ), AlbumItem( id: "MPREb_CznUTKnATw6", @@ -102,14 +102,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCZK5n7V2-iPHfUXLV2tDvzw", + ArtistId( + id: Some("UCZK5n7V2-iPHfUXLV2tDvzw"), name: "Cojack", ), ], - artists_txt: "Cojack", album_type: Single, year: Some(2020), + by_va: false, ), AlbumItem( id: "MPREb_Sx4uifBuKyD", @@ -137,14 +137,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCudOYmRtW3uylYtqY1aAD0A", + ArtistId( + id: Some("UCudOYmRtW3uylYtqY1aAD0A"), name: "Montana Of 300", ), ], - artists_txt: "Montana Of 300", album_type: Single, year: Some(2020), + by_va: false, ), AlbumItem( id: "MPREb_PdIIalyOQXF", @@ -172,14 +172,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC8whsREta_7Fu-EjRq2Ys-A", + ArtistId( + id: Some("UC8whsREta_7Fu-EjRq2Ys-A"), name: "Alpha Wolf", ), ], - artists_txt: "Alpha Wolf", album_type: Single, year: Some(2018), + by_va: false, ), AlbumItem( id: "MPREb_9KdyuqvufOL", @@ -207,14 +207,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCRy7ecValgvorRe_8dum9lA", + ArtistId( + id: Some("UCRy7ecValgvorRe_8dum9lA"), name: "ESKIIMO", ), ], - artists_txt: "ESKIIMO", album_type: Ep, year: Some(2022), + by_va: false, ), AlbumItem( id: "MPREb_VDjWCOUvD7s", @@ -242,14 +242,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCdkNrc_l73BHYKRhDqxBo9w", + ArtistId( + id: Some("UCdkNrc_l73BHYKRhDqxBo9w"), name: "Black Mamba Man", ), ], - artists_txt: "Black Mamba Man", album_type: Album, year: Some(2017), + by_va: false, ), AlbumItem( id: "MPREb_xjJaY8xb2Rw", @@ -277,14 +277,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCn09cNujyKjEA1NxD5Aj_mQ", + ArtistId( + id: Some("UCn09cNujyKjEA1NxD5Aj_mQ"), name: "Paride Saraceni", ), ], - artists_txt: "Paride Saraceni", album_type: Single, year: Some(2019), + by_va: false, ), AlbumItem( id: "MPREb_CH1VEbx7Lle", @@ -312,14 +312,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCYAFIwL4uBWQHBrBiohx1vw", + ArtistId( + id: Some("UCYAFIwL4uBWQHBrBiohx1vw"), name: "Addis Black Mamba", ), ], - artists_txt: "Addis Black Mamba", album_type: Single, year: Some(2019), + by_va: false, ), AlbumItem( id: "MPREb_IfiMtX5CnWJ", @@ -347,22 +347,22 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCs04jfHH78YUziFA52P97LA", + ArtistId( + id: Some("UCs04jfHH78YUziFA52P97LA"), name: "R. Black Mamba", ), - ChannelId( - id: "UCsOfYy8UlBPRYkC5lgRaatA", + ArtistId( + id: Some("UCsOfYy8UlBPRYkC5lgRaatA"), name: "Lonzzo", ), - ChannelId( - id: "UCEwg585uC9nBoL8KA7ayjPA", + ArtistId( + id: Some("UCEwg585uC9nBoL8KA7ayjPA"), name: "24.Gz", ), ], - artists_txt: "R. Black Mamba, Lonzzo & 24.Gz", album_type: Single, year: Some(2022), + by_va: false, ), AlbumItem( id: "MPREb_DeCImAQRYMO", @@ -390,14 +390,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCZwE-b-kzA4pQaCQXwOQnlg", + ArtistId( + id: Some("UCZwE-b-kzA4pQaCQXwOQnlg"), name: "Seoul Philharmonic Orchestra", ), ], - artists_txt: "Seoul Philharmonic Orchestra", album_type: Single, year: Some(2022), + by_va: false, ), AlbumItem( id: "MPREb_vXAHel98vo2", @@ -425,14 +425,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC_SI7sOel-qMTvSe-lGHX8w", + ArtistId( + id: Some("UC_SI7sOel-qMTvSe-lGHX8w"), name: "Hever Jara", ), ], - artists_txt: "Hever Jara", album_type: Single, year: Some(2018), + by_va: false, ), AlbumItem( id: "MPREb_iAemzaCGXuo", @@ -460,14 +460,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCMZowOoC3u_ntr9o52ekeZw", + ArtistId( + id: Some("UCMZowOoC3u_ntr9o52ekeZw"), name: "Yung FN", ), ], - artists_txt: "Yung FN", album_type: Single, year: Some(2022), + by_va: false, ), AlbumItem( id: "MPREb_CbIA5po2cn4", @@ -495,14 +495,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCX6v_euBwliDYV2NMTouuSA", + ArtistId( + id: Some("UCX6v_euBwliDYV2NMTouuSA"), name: "Hobino", ), ], - artists_txt: "Hobino", album_type: Single, year: Some(2022), + by_va: false, ), AlbumItem( id: "MPREb_yrsxU7t0h6l", @@ -530,14 +530,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCAlOD5s3Ro27M61-2Z_UB7w", + ArtistId( + id: Some("UCAlOD5s3Ro27M61-2Z_UB7w"), name: "Tee See Connection", ), ], - artists_txt: "Tee See Connection", album_type: Single, year: Some(2013), + by_va: false, ), AlbumItem( id: "MPREb_fETChb2O2uR", @@ -565,14 +565,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC77rFNJxH8Y2VwSYp8ZTXHA", + ArtistId( + id: Some("UC77rFNJxH8Y2VwSYp8ZTXHA"), name: "Franco Vitola", ), ], - artists_txt: "Franco Vitola", album_type: Single, year: Some(2020), + by_va: false, ), AlbumItem( id: "MPREb_VcRKLYVgy11", @@ -600,14 +600,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCxX9tNcQgCBuU56ezupriqg", + ArtistId( + id: Some("UCxX9tNcQgCBuU56ezupriqg"), name: "Black Mamba", ), ], - artists_txt: "Black Mamba", album_type: Album, year: Some(2011), + by_va: false, ), AlbumItem( id: "MPREb_grtT3Ze8U2Z", @@ -635,14 +635,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC6Y8G45J9Uv2EsLLOatymOw", + ArtistId( + id: Some("UC6Y8G45J9Uv2EsLLOatymOw"), name: "WookTheCrook", ), ], - artists_txt: "WookTheCrook", album_type: Single, year: Some(2022), + by_va: false, ), AlbumItem( id: "MPREb_hXasyBrDJm7", @@ -670,14 +670,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCaDT20-B3U8h-tPg_VMvntw", + ArtistId( + id: Some("UCaDT20-B3U8h-tPg_VMvntw"), name: "The Black Mamba", ), ], - artists_txt: "The Black Mamba", album_type: Album, year: Some(2012), + by_va: false, ), AlbumItem( id: "MPREb_jDiEDfz09CY", @@ -705,14 +705,14 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCJq1MEuNM0SidXn5pMqqHBA", + ArtistId( + id: Some("UCJq1MEuNM0SidXn5pMqqHBA"), name: "Voltage", ), ], - artists_txt: "Voltage", album_type: Single, year: Some(2019), + by_va: false, ), ], ctoken: Some("EoIGEgtibGFjayBtYW1iYRryBUVnV0tBUUlZQVVnVWFnd1FBeEFFRUFrUURoQUtFQVdDQVJoVlEyRjJabUpWTlc0emFEaHZXR2RSUzBkTlZqTkhXbEdDQVJoVlEzbE1XR2hVTWxGU1ZYRlJVbUZUY2tST1RVSmZNMmVDQVJoVlEyZG1SR2RXWVRsbE9EWm1TVTVZYTE5elpWOWxlWGVDQVJoVlEzZGlNekEyT0ZkQ1dYTlJjbkl5WDBSS1pIRlRaWGVDQVJoVlEwZEhWVVkwWHpjMFZuWkxSbmR1Y0ZCRU1FWndPRUdDQVJoVlEyaHBaMVprUkhVM1owTkpZWEJ0ZUZSeGEyZG1RM2VDQVJoVlEyd3laVFpzVXkwdGQzYzNabnBLWVMxV2QxQkJNbWVDQVJoVlF6Z3RhbmxoVkdsSU9VWlViVGRRZG10RllYa3hWVUdDQVJoVlF5MDBOSGRNWm04eldISmplbGROZFdsQ1JWbHJWVUdDQVJoVlEzWnVjVmw1UVdSUGJWRnZVMlpMZEV0SldYVm5NbEdDQVJoVlEyWmlhMFpCTjFSU01tMXhRbU5WVVZCWFZFaDBWWGVDQVJoVlEzcHlkM2RGZUhZeWQxUmFkUzFrVldobU9DMVdUbmVDQVJoVlEySmpNa2xCYmxOTE0zcDBWR0YyVGtkTFJrRk5UWGVDQVJoVlF6UnlSVGRPTW5sR2VrVXdNVVozY1ZwdVdrWm5RVUdDQVJoVlEwRTBORFF4YlZGaGNHazNTbU5RWmpkVVkxOHdSVUdDQVJoVlEzZHBZVjl1ZUc5QlkwRjFiVmgzUmpVeVVHeDFYMmVDQVJoVlF6QlZVMWhDU1VOcmJHbGlhSGxVUkhKaWVHUldMVkdDQVJoVlF6bERMV1pwVG1JM1FWWjJjRGRWZGxKdlEyMTJjMUdDQVJoVlEwZFZkMUJHWVVaMFdVRXRiamRhVERSSFlubHlYM2VDQVJoVlEySkdiRTR5Y0RCT1owbERlbVZYVFRNd1pIQTFaMmMlM0QY8erQLg%3D%3D"), diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_default.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_default.snap index 2a46a44..f73aa67 100644 --- a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_default.snap +++ b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_default.snap @@ -16,12 +16,11 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCEdZAdnnKqbaHOlv8nM6OtA", + ArtistId( + id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), name: "aespa", ), ], - artists_txt: Some("aespa"), album: None, view_count: Some(235000000), is_video: true, @@ -44,12 +43,11 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCEdZAdnnKqbaHOlv8nM6OtA", + ArtistId( + id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), name: "aespa", ), ], - artists_txt: Some("aespa"), album: Some(AlbumId( id: "MPREb_OpHWHwyNOuY", name: "Black Mamba", @@ -75,16 +73,15 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCfCNL5oajlQBAlyjWv1ChVw", + ArtistId( + id: Some("UCfCNL5oajlQBAlyjWv1ChVw"), name: "Hans Zimmer", ), - ChannelId( - id: "UCvTXGTZf9EvuCAwZOkoR2iQ", + ArtistId( + id: Some("UCvTXGTZf9EvuCAwZOkoR2iQ"), name: "Lorne Balfe", ), ], - artists_txt: Some("Hans Zimmer & Lorne Balfe"), album: Some(AlbumId( id: "MPREb_UmDOhLpDsc0", name: "Megamind (Music from the Motion Picture)", @@ -110,12 +107,11 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCz6yr3CgFGrrrPDa2asbWMQ", + ArtistId( + id: Some("UCz6yr3CgFGrrrPDa2asbWMQ"), name: "Bayamon PR Tribe", ), ], - artists_txt: Some("Bayamon PR Tribe"), album: Some(AlbumId( id: "MPREb_RV0PGHyGfkp", name: "LISTEN ME", @@ -136,12 +132,11 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCS_hnpJLQTvBkqALgapi_4g", + ArtistId( + id: Some("UCS_hnpJLQTvBkqALgapi_4g"), name: "스브스케이팝 X INKIGAYO", ), ], - artists_txt: Some("스브스케이팝 X INKIGAYO"), album: None, view_count: Some(10000000), is_video: true, @@ -159,12 +154,11 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCEdZAdnnKqbaHOlv8nM6OtA", + ArtistId( + id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), name: "aespa", ), ], - artists_txt: Some("aespa"), album: None, view_count: Some(18000000), is_video: true, @@ -182,12 +176,11 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UC5BMQOsAB8hKUyHu9KI6yig", + ArtistId( + id: Some("UC5BMQOsAB8hKUyHu9KI6yig"), name: "KBS WORLD TV", ), ], - artists_txt: Some("KBS WORLD TV"), album: None, view_count: Some(3200000), is_video: true, @@ -221,14 +214,14 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCEdZAdnnKqbaHOlv8nM6OtA", + ArtistId( + id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), name: "aespa", ), ], - artists_txt: "aespa", album_type: Single, year: Some(2020), + by_va: false, ), AlbumItem( id: "MPREb_pvdHyqvGjbI", @@ -256,14 +249,14 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCEdZAdnnKqbaHOlv8nM6OtA", + ArtistId( + id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), name: "aespa", ), ], - artists_txt: "aespa", album_type: Album, year: Some(2022), + by_va: false, ), AlbumItem( id: "MPREb_CznUTKnATw6", @@ -291,14 +284,14 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCZK5n7V2-iPHfUXLV2tDvzw", + ArtistId( + id: Some("UCZK5n7V2-iPHfUXLV2tDvzw"), name: "Cojack", ), ], - artists_txt: "Cojack", album_type: Single, year: Some(2020), + by_va: false, ), ], artists: [ diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_default.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_default.snap index c9454f0..3c396c4 100644 --- a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_default.snap +++ b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_default.snap @@ -23,12 +23,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCEdZAdnnKqbaHOlv8nM6OtA", + ArtistId( + id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), name: "aespa", ), ], - artists_txt: Some("aespa"), album: Some(AlbumId( id: "MPREb_OpHWHwyNOuY", name: "Black Mamba", @@ -54,16 +53,15 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCfCNL5oajlQBAlyjWv1ChVw", + ArtistId( + id: Some("UCfCNL5oajlQBAlyjWv1ChVw"), name: "Hans Zimmer", ), - ChannelId( - id: "UCvTXGTZf9EvuCAwZOkoR2iQ", + ArtistId( + id: Some("UCvTXGTZf9EvuCAwZOkoR2iQ"), name: "Lorne Balfe", ), ], - artists_txt: Some("Hans Zimmer & Lorne Balfe"), album: Some(AlbumId( id: "MPREb_UmDOhLpDsc0", name: "Megamind (Music from the Motion Picture)", @@ -89,12 +87,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCZwE-b-kzA4pQaCQXwOQnlg", + ArtistId( + id: Some("UCZwE-b-kzA4pQaCQXwOQnlg"), name: "Seoul Philharmonic Orchestra", ), ], - artists_txt: Some("Seoul Philharmonic Orchestra"), album: Some(AlbumId( id: "MPREb_DeCImAQRYMO", name: "Black Mamba (Orchestra Version)", @@ -120,12 +117,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC8whsREta_7Fu-EjRq2Ys-A", + ArtistId( + id: Some("UC8whsREta_7Fu-EjRq2Ys-A"), name: "Alpha Wolf", ), ], - artists_txt: Some("Alpha Wolf"), album: Some(AlbumId( id: "MPREb_PdIIalyOQXF", name: "Black Mamba", @@ -151,12 +147,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCz6yr3CgFGrrrPDa2asbWMQ", + ArtistId( + id: Some("UCz6yr3CgFGrrrPDa2asbWMQ"), name: "Bayamon PR Tribe", ), ], - artists_txt: Some("Bayamon PR Tribe"), album: Some(AlbumId( id: "MPREb_RV0PGHyGfkp", name: "LISTEN ME", @@ -182,12 +177,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC7sFWdsZTzfR507dbonTlyQ", + ArtistId( + id: Some("UC7sFWdsZTzfR507dbonTlyQ"), name: "Jethro Tull", ), ], - artists_txt: Some("Jethro Tull"), album: Some(AlbumId( id: "MPREb_uC4NIfLr7VS", name: "J-Tull Dot Com", @@ -213,12 +207,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCzqRJ5qy_ekVd9jfaAlb7nA", + ArtistId( + id: Some("UCzqRJ5qy_ekVd9jfaAlb7nA"), name: "FREE FLOW FLAVA", ), ], - artists_txt: Some("FREE FLOW FLAVA"), album: Some(AlbumId( id: "MPREb_4gkEob83yi2", name: "Hidden Tape", @@ -244,12 +237,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCi8RICptUr15gPmPjEuIEDQ", + ArtistId( + id: Some("UCi8RICptUr15gPmPjEuIEDQ"), name: "Ashkabad", ), ], - artists_txt: Some("Ashkabad"), album: Some(AlbumId( id: "MPREb_SU8gaBGZv2T", name: "Reptile", @@ -275,12 +267,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCudOYmRtW3uylYtqY1aAD0A", + ArtistId( + id: Some("UCudOYmRtW3uylYtqY1aAD0A"), name: "Montana Of 300", ), ], - artists_txt: Some("Montana Of 300"), album: Some(AlbumId( id: "MPREb_Sx4uifBuKyD", name: "Black Mamba", @@ -306,12 +297,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCoNSQrGCiSZscyBwQTsMK2g", + ArtistId( + id: Some("UCoNSQrGCiSZscyBwQTsMK2g"), name: "Dj Zapy & Dj Uragun", ), ], - artists_txt: Some("Dj Zapy & Dj Uragun"), album: Some(AlbumId( id: "MPREb_nfwzSf4mnx4", name: "Black Mamba", @@ -337,12 +327,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCkjmrFnxpkxI4cVVwhc_mMw", + ArtistId( + id: Some("UCkjmrFnxpkxI4cVVwhc_mMw"), name: "Alex Torres y Los Reyes Latinos", ), ], - artists_txt: Some("Alex Torres y Los Reyes Latinos"), album: Some(AlbumId( id: "MPREb_9SbptcWbS7a", name: "Elementos", @@ -367,8 +356,12 @@ MusicSearchFiltered( height: 120, ), ], - artists: [], - artists_txt: Some("C.JERRY"), + artists: [ + ArtistId( + id: None, + name: "C.JERRY", + ), + ], album: Some(AlbumId( id: "MPREb_0lYy8bzdAWJ", name: "Bleem多维视角", @@ -394,16 +387,15 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC_PI4ScqWXzHuYP2TNqw6vg", + ArtistId( + id: Some("UC_PI4ScqWXzHuYP2TNqw6vg"), name: "Nerissima Serpe", ), - ChannelId( - id: "UCugPYAOw4Ig_6043IZslywQ", + ArtistId( + id: Some("UCugPYAOw4Ig_6043IZslywQ"), name: "Fri2", ), ], - artists_txt: Some("Nerissima Serpe & Fri2"), album: Some(AlbumId( id: "MPREb_6cqJGhzYwwg", name: "BLCK MAMBA", @@ -429,12 +421,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCr8Gk2ECkAhRzNWCqKg62bA", + ArtistId( + id: Some("UCr8Gk2ECkAhRzNWCqKg62bA"), name: "Biodizzy", ), ], - artists_txt: Some("Biodizzy"), album: Some(AlbumId( id: "MPREb_11tzMasyq5O", name: "Mathomo Mayo", @@ -460,12 +451,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC6LdZsjHDoy88JtQnEz4z4A", + ArtistId( + id: Some("UC6LdZsjHDoy88JtQnEz4z4A"), name: "Mamba Cinco", ), ], - artists_txt: Some("Mamba Cinco"), album: Some(AlbumId( id: "MPREb_BBP23Ry1SBL", name: "Told Black", @@ -491,16 +481,15 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCX1lJbaUf3IEGhNi1_KCEZw", + ArtistId( + id: Some("UCX1lJbaUf3IEGhNi1_KCEZw"), name: "Vagabond", ), - ChannelId( - id: "UCt4qpUnoWz3aUM5DYDBod0A", + ArtistId( + id: Some("UCt4qpUnoWz3aUM5DYDBod0A"), name: "Brisk", ), ], - artists_txt: Some("Vagabond & Brisk"), album: Some(AlbumId( id: "MPREb_aLZJtqNevjw", name: "Night & Dayz / Black Mamba", @@ -526,12 +515,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCoJXsT1SzLsZZgg5P0yaVQw", + ArtistId( + id: Some("UCoJXsT1SzLsZZgg5P0yaVQw"), name: "Ghost Tribe", ), ], - artists_txt: Some("Ghost Tribe"), album: Some(AlbumId( id: "MPREb_fzz3cs4IkeX", name: "Black Mamba Jiu Jitsu", @@ -557,12 +545,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCxoJ3pl32f39kmTvIR_NWOg", + ArtistId( + id: Some("UCxoJ3pl32f39kmTvIR_NWOg"), name: "Akae Beka", ), ], - artists_txt: Some("Akae Beka"), album: Some(AlbumId( id: "MPREb_iuN0lQwEmRp", name: "Kings Dub", @@ -588,12 +575,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC7RJTtpE3qwbw6-Idq9PTIg", + ArtistId( + id: Some("UC7RJTtpE3qwbw6-Idq9PTIg"), name: "Shockwave-Sound", ), ], - artists_txt: Some("Shockwave-Sound"), album: Some(AlbumId( id: "MPREb_Kg4Ff883GH0", name: "Out on the Road", @@ -619,12 +605,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCfGf1P_mK274Rp3OKFTgbBQ", + ArtistId( + id: Some("UCfGf1P_mK274Rp3OKFTgbBQ"), name: "Dubb Bankroll", ), ], - artists_txt: Some("Dubb Bankroll"), album: Some(AlbumId( id: "MPREb_VGZMM6pmzrt", name: "Area 51", diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_typo.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_typo.snap index ff666e6..82cb017 100644 --- a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_typo.snap +++ b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_typo.snap @@ -23,12 +23,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCIh4j8fXWf2U0ro0qnGU8Mg", + ArtistId( + id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), name: "Namika", ), ], - artists_txt: Some("Namika"), album: Some(AlbumId( id: "MPREb_RXHxrUFfrvQ", name: "Lieblingsmensch", @@ -54,12 +53,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCCpID8TTjkkjLCwBybAfHSg", + ArtistId( + id: Some("UCCpID8TTjkkjLCwBybAfHSg"), name: "Boris Brejcha", ), ], - artists_txt: Some("Boris Brejcha"), album: Some(AlbumId( id: "MPREb_VFqQlfPhsFW", name: "Lieblingsmensch", @@ -85,12 +83,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCMLbHQGqUHeNAqjOL1qXZXg", + ArtistId( + id: Some("UCMLbHQGqUHeNAqjOL1qXZXg"), name: "Lumbematz", ), ], - artists_txt: Some("Lumbematz"), album: Some(AlbumId( id: "MPREb_14GKjCEauSE", name: "Lieblingsmensch", @@ -116,12 +113,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCCpID8TTjkkjLCwBybAfHSg", + ArtistId( + id: Some("UCCpID8TTjkkjLCwBybAfHSg"), name: "Boris Brejcha", ), ], - artists_txt: Some("Boris Brejcha"), album: Some(AlbumId( id: "MPREb_AlIjxpnBKtn", name: "Lieblingsmensch (Edit)", @@ -147,12 +143,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCTJBrv8T8AxavAynvB3_DSw", + ArtistId( + id: Some("UCTJBrv8T8AxavAynvB3_DSw"), name: "Seer", ), ], - artists_txt: Some("Seer"), album: Some(AlbumId( id: "MPREb_t2Laj9ENdVn", name: "echt seerisch", @@ -178,12 +173,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCtoec88rzlhABHeo_4d-H8g", + ArtistId( + id: Some("UCtoec88rzlhABHeo_4d-H8g"), name: "Dame", ), ], - artists_txt: Some("Dame"), album: Some(AlbumId( id: "MPREb_9ILis64aD76", name: "Notiz an mich", @@ -209,12 +203,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UClOpZVfE5v-fFtM8vqFud-g", + ArtistId( + id: Some("UClOpZVfE5v-fFtM8vqFud-g"), name: "KIDZ BOP Kids", ), ], - artists_txt: Some("KIDZ BOP Kids"), album: Some(AlbumId( id: "MPREb_vxdAMBsmm1s", name: "KIDZ BOP Ultimate Playlist", @@ -240,12 +233,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCIh4j8fXWf2U0ro0qnGU8Mg", + ArtistId( + id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), name: "Namika", ), ], - artists_txt: Some("Namika"), album: Some(AlbumId( id: "MPREb_V5f8YfHKp2j", name: "Lieblingsmensch", @@ -271,12 +263,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCvfUKCnUBfsZAVHgF-pYmJg", + ArtistId( + id: Some("UCvfUKCnUBfsZAVHgF-pYmJg"), name: "Voyce", ), ], - artists_txt: Some("Voyce"), album: Some(AlbumId( id: "MPREb_SpT32xAd4YR", name: "Gegenstück EP", @@ -302,12 +293,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCosvbvqFxbUniyDCUNXN5wA", + ArtistId( + id: Some("UCosvbvqFxbUniyDCUNXN5wA"), name: "Klaus Hanslbauer", ), ], - artists_txt: Some("Klaus Hanslbauer"), album: Some(AlbumId( id: "MPREb_oz9ZiEQcBU4", name: "Lieblingsmensch", @@ -333,12 +323,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCIh4j8fXWf2U0ro0qnGU8Mg", + ArtistId( + id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), name: "Namika", ), ], - artists_txt: Some("Namika"), album: Some(AlbumId( id: "MPREb_V5f8YfHKp2j", name: "Lieblingsmensch", @@ -364,12 +353,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCk-g5nfpm8Q9gfy7DuU8PZA", + ArtistId( + id: Some("UCk-g5nfpm8Q9gfy7DuU8PZA"), name: "VVIER", ), ], - artists_txt: Some("VVIER"), album: Some(AlbumId( id: "MPREb_Oc7tpyMz6uE", name: "Zusammen", @@ -395,12 +383,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCIh4j8fXWf2U0ro0qnGU8Mg", + ArtistId( + id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), name: "Namika", ), ], - artists_txt: Some("Namika"), album: Some(AlbumId( id: "MPREb_V5f8YfHKp2j", name: "Lieblingsmensch", @@ -426,12 +413,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCDBvf2dl0XZQvIKPsrsDprg", + ArtistId( + id: Some("UCDBvf2dl0XZQvIKPsrsDprg"), name: "Sebó", ), ], - artists_txt: Some("Sebó"), album: Some(AlbumId( id: "MPREb_X5boeaZWzPX", name: "Lieblingsmensch", @@ -457,12 +443,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC2_O7ywkwEh-crQedvyNOYg", + ArtistId( + id: Some("UC2_O7ywkwEh-crQedvyNOYg"), name: "DIA Herbst", ), ], - artists_txt: Some("DIA Herbst"), album: Some(AlbumId( id: "MPREb_8f4SNZ8HDhD", name: "Lieblingsmensch", @@ -487,8 +472,12 @@ MusicSearchFiltered( height: 120, ), ], - artists: [], - artists_txt: Some("Jasmin Bick"), + artists: [ + ArtistId( + id: None, + name: "Jasmin Bick", + ), + ], album: Some(AlbumId( id: "MPREb_6PhWrMAoiO3", name: "Volksmusik Sommer 2017", @@ -514,12 +503,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCtsMcVBiK9QvtS2LH8Z6M5g", + ArtistId( + id: Some("UCtsMcVBiK9QvtS2LH8Z6M5g"), name: "Apres Ski", ), ], - artists_txt: Some("Apres Ski"), album: Some(AlbumId( id: "MPREb_4HeyZ3um21Q", name: "Ballermann Stars - Après Ski Hits 2016 Party (Die XXL Schlager Party im Karneval und Fasching der Saison 2015 bis 2016)", @@ -545,12 +533,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC16V9XG1PfOD1E0m6G-s22A", + ArtistId( + id: Some("UC16V9XG1PfOD1E0m6G-s22A"), name: "Trap Lion Beats", ), ], - artists_txt: Some("Trap Lion Beats"), album: Some(AlbumId( id: "MPREb_BVRbZ6muIXJ", name: "25 Trap Beats, Vol. 5", @@ -575,8 +562,12 @@ MusicSearchFiltered( height: 120, ), ], - artists: [], - artists_txt: Some("Eva Florist"), + artists: [ + ArtistId( + id: None, + name: "Eva Florist", + ), + ], album: Some(AlbumId( id: "MPREb_wRHz8l7GRIp", name: "Ballermann Raketen - Die Party Hits für Weihnachten und die Silvester Schlager Fete der Saison 2015 bis 2016", @@ -602,12 +593,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCIh4j8fXWf2U0ro0qnGU8Mg", + ArtistId( + id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), name: "Namika", ), ], - artists_txt: Some("Namika"), album: Some(AlbumId( id: "MPREb_eew4y1xo5Q3", name: "Live @ DELUXE MUSIC SESSION", diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_videos.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_videos.snap index e42c429..3b45d62 100644 --- a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_videos.snap +++ b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_videos.snap @@ -18,12 +18,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCEdZAdnnKqbaHOlv8nM6OtA", + ArtistId( + id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), name: "aespa", ), ], - artists_txt: Some("aespa"), album: None, view_count: Some(235000000), is_video: true, @@ -41,12 +40,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCyEMqKQPGdj8wKVKt2-agbQ", + ArtistId( + id: Some("UCyEMqKQPGdj8wKVKt2-agbQ"), name: "Beatport", ), ], - artists_txt: Some("Beatport"), album: None, view_count: Some(6400), is_video: true, @@ -64,12 +62,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC0PlwwXUJihXdol4I9vuE0g", + ArtistId( + id: Some("UC0PlwwXUJihXdol4I9vuE0g"), name: "PridePKJ", ), ], - artists_txt: Some("PridePKJ"), album: None, view_count: Some(701), is_video: true, @@ -87,12 +84,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCzP_LIeF9W26F7o03k-Y9CQ", + ArtistId( + id: Some("UCzP_LIeF9W26F7o03k-Y9CQ"), name: "Seayou Records", ), ], - artists_txt: Some("Seayou Records"), album: None, view_count: Some(80000), is_video: true, @@ -110,12 +106,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCRpjHHu8ivVWs73uxHlWwFA", + ArtistId( + id: Some("UCRpjHHu8ivVWs73uxHlWwFA"), name: "Eurovision Song Contest", ), ], - artists_txt: Some("Eurovision Song Contest"), album: None, view_count: Some(1100000), is_video: true, @@ -133,12 +128,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCoRXPcv8XK5fAplLbk9PTww", + ArtistId( + id: Some("UCoRXPcv8XK5fAplLbk9PTww"), name: "THE K-POP", ), ], - artists_txt: Some("THE K-POP"), album: None, view_count: Some(269000), is_video: true, @@ -156,12 +150,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCsw9NVMkJfbxHTuMUMlk3mw", + ArtistId( + id: Some("UCsw9NVMkJfbxHTuMUMlk3mw"), name: "Dj Kronos", ), ], - artists_txt: Some("Dj Kronos"), album: None, view_count: Some(32000), is_video: true, @@ -179,12 +172,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCBju0pyQY7EWRvLqMkXcxBw", + ArtistId( + id: Some("UCBju0pyQY7EWRvLqMkXcxBw"), name: "1O1% MUSIC", ), ], - artists_txt: Some("1O1% MUSIC"), album: None, view_count: Some(179000), is_video: true, @@ -202,12 +194,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCawCt_6XWaFxZSW5ZKcIMew", + ArtistId( + id: Some("UCawCt_6XWaFxZSW5ZKcIMew"), name: "MTV ASIA", ), ], - artists_txt: Some("MTV ASIA"), album: None, view_count: Some(69000), is_video: true, @@ -225,12 +216,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC_vrqgb3YLoe2MYSJm2aO-A", + ArtistId( + id: Some("UC_vrqgb3YLoe2MYSJm2aO-A"), name: "K-Series : STORY & MUSIC", ), ], - artists_txt: Some("K-Series : STORY & MUSIC"), album: None, view_count: Some(28000), is_video: true, @@ -248,12 +238,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UC5BMQOsAB8hKUyHu9KI6yig", + ArtistId( + id: Some("UC5BMQOsAB8hKUyHu9KI6yig"), name: "KBS WORLD TV", ), ], - artists_txt: Some("KBS WORLD TV"), album: None, view_count: Some(1300000), is_video: true, @@ -271,12 +260,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCoRXPcv8XK5fAplLbk9PTww", + ArtistId( + id: Some("UCoRXPcv8XK5fAplLbk9PTww"), name: "THE K-POP", ), ], - artists_txt: Some("THE K-POP"), album: None, view_count: Some(3000000), is_video: true, @@ -294,12 +282,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCaDT20-B3U8h-tPg_VMvntw", + ArtistId( + id: Some("UCaDT20-B3U8h-tPg_VMvntw"), name: "The Black Mamba", ), ], - artists_txt: Some("The Black Mamba"), album: None, view_count: Some(49000), is_video: true, @@ -317,12 +304,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCEAgugIw6pHGg7MRlkOU1Dw", + ArtistId( + id: Some("UCEAgugIw6pHGg7MRlkOU1Dw"), name: "Studio Brussel", ), ], - artists_txt: Some("Studio Brussel"), album: None, view_count: Some(29000), is_video: true, @@ -340,12 +326,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCAj9gLNfM0q3MFhovVmAtBw", + ArtistId( + id: Some("UCAj9gLNfM0q3MFhovVmAtBw"), name: "Achim Müller", ), ], - artists_txt: Some("Achim Müller"), album: None, view_count: Some(823), is_video: true, @@ -363,12 +348,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCRpjHHu8ivVWs73uxHlWwFA", + ArtistId( + id: Some("UCRpjHHu8ivVWs73uxHlWwFA"), name: "Eurovision Song Contest", ), ], - artists_txt: Some("Eurovision Song Contest"), album: None, view_count: Some(1800000), is_video: true, @@ -386,12 +370,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCeLPm9yH_a_QH8n6445G-Ow", + ArtistId( + id: Some("UCeLPm9yH_a_QH8n6445G-Ow"), name: "KBS Kpop", ), ], - artists_txt: Some("KBS Kpop"), album: None, view_count: Some(4400000), is_video: true, @@ -409,12 +392,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCaDT20-B3U8h-tPg_VMvntw", + ArtistId( + id: Some("UCaDT20-B3U8h-tPg_VMvntw"), name: "The Black Mamba", ), ], - artists_txt: Some("The Black Mamba"), album: None, view_count: Some(1300), is_video: true, @@ -432,12 +414,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCEdZAdnnKqbaHOlv8nM6OtA", + ArtistId( + id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), name: "aespa", ), ], - artists_txt: Some("aespa"), album: None, view_count: Some(249000000), is_video: true, @@ -455,12 +436,11 @@ MusicSearchFiltered( ), ], artists: [ - ChannelId( - id: "UCB-TbzcDawIZVkG229eqnKg", + ArtistId( + id: Some("UCB-TbzcDawIZVkG229eqnKg"), name: "Sweet & Sour", ), ], - artists_txt: Some("Sweet & Sour"), album: None, view_count: Some(15000), is_video: true, diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_typo.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_typo.snap index 5e76805..de76fab 100644 --- a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_typo.snap +++ b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_typo.snap @@ -21,12 +21,11 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCIh4j8fXWf2U0ro0qnGU8Mg", + ArtistId( + id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), name: "Namika", ), ], - artists_txt: Some("Namika"), album: Some(AlbumId( id: "MPREb_RXHxrUFfrvQ", name: "Lieblingsmensch", @@ -52,12 +51,11 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCCpID8TTjkkjLCwBybAfHSg", + ArtistId( + id: Some("UCCpID8TTjkkjLCwBybAfHSg"), name: "Boris Brejcha", ), ], - artists_txt: Some("Boris Brejcha"), album: Some(AlbumId( id: "MPREb_VFqQlfPhsFW", name: "Lieblingsmensch", @@ -83,12 +81,11 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCvfUKCnUBfsZAVHgF-pYmJg", + ArtistId( + id: Some("UCvfUKCnUBfsZAVHgF-pYmJg"), name: "Voyce", ), ], - artists_txt: Some("Voyce"), album: Some(AlbumId( id: "MPREb_SpT32xAd4YR", name: "Gegenstück EP", @@ -109,12 +106,11 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCIh4j8fXWf2U0ro0qnGU8Mg", + ArtistId( + id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), name: "Namika", ), ], - artists_txt: Some("Namika"), album: None, view_count: Some(108000000), is_video: true, @@ -132,12 +128,11 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCgoJMRKimbxB374QjHgE6kA", + ArtistId( + id: Some("UCgoJMRKimbxB374QjHgE6kA"), name: "jessika adam", ), ], - artists_txt: Some("jessika adam"), album: None, view_count: Some(10000000), is_video: true, @@ -155,12 +150,11 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCiQjRO2m3dBBlg7sqTaFA_A", + ArtistId( + id: Some("UCiQjRO2m3dBBlg7sqTaFA_A"), name: "ZockerAlarm", ), ], - artists_txt: Some("ZockerAlarm"), album: None, view_count: Some(56000), is_video: true, @@ -194,14 +188,14 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCIh4j8fXWf2U0ro0qnGU8Mg", + ArtistId( + id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), name: "Namika", ), ], - artists_txt: "Namika", album_type: Single, year: Some(2015), + by_va: false, ), AlbumItem( id: "MPREb_V5f8YfHKp2j", @@ -229,14 +223,14 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCIh4j8fXWf2U0ro0qnGU8Mg", + ArtistId( + id: Some("UCIh4j8fXWf2U0ro0qnGU8Mg"), name: "Namika", ), ], - artists_txt: "Namika", album_type: Ep, year: Some(2015), + by_va: false, ), AlbumItem( id: "MPREb_AlIjxpnBKtn", @@ -264,14 +258,14 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCCpID8TTjkkjLCwBybAfHSg", + ArtistId( + id: Some("UCCpID8TTjkkjLCwBybAfHSg"), name: "Boris Brejcha", ), ], - artists_txt: "Boris Brejcha", album_type: Single, year: Some(2019), + by_va: false, ), AlbumItem( id: "MPREb_VFqQlfPhsFW", @@ -299,14 +293,14 @@ MusicSearchResult( ), ], artists: [ - ChannelId( - id: "UCCpID8TTjkkjLCwBybAfHSg", + ArtistId( + id: Some("UCCpID8TTjkkjLCwBybAfHSg"), name: "Boris Brejcha", ), ], - artists_txt: "Boris Brejcha", album_type: Single, year: Some(2019), + by_va: false, ), ], artists: [ diff --git a/src/client/snapshots/rustypipe__client__pagination__tests__map_playlist_tracks.snap b/src/client/snapshots/rustypipe__client__pagination__tests__map_playlist_tracks.snap index 248e824..5a9b3a5 100644 --- a/src/client/snapshots/rustypipe__client__pagination__tests__map_playlist_tracks.snap +++ b/src/client/snapshots/rustypipe__client__pagination__tests__map_playlist_tracks.snap @@ -17,12 +17,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCDLPHv0SrvyUzct8UYQ9R_g", + ArtistId( + id: Some("UCDLPHv0SrvyUzct8UYQ9R_g"), name: "KMNGANG", ), ], - artists_txt: Some("KMNGANG"), album: None, view_count: None, is_video: true, @@ -40,16 +39,15 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCXUNYorrTVi7iG5FUnr-Gbg", + ArtistId( + id: Some("UCXUNYorrTVi7iG5FUnr-Gbg"), name: "Azet", ), - ChannelId( - id: "UC3MZNlOw72DZEeoBo7PzHEA", + ArtistId( + id: Some("UC3MZNlOw72DZEeoBo7PzHEA"), name: "Zuna", ), ], - artists_txt: Some("Azet & Zuna"), album: None, view_count: None, is_video: true, @@ -67,16 +65,15 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCcyO_SNHFhbdogh9PPBB9LA", + ArtistId( + id: Some("UCcyO_SNHFhbdogh9PPBB9LA"), name: "MoTrip", ), - ChannelId( - id: "UCbqJ-0ByHVGVqQpzdafByfw", + ArtistId( + id: Some("UCbqJ-0ByHVGVqQpzdafByfw"), name: "Rooz", ), ], - artists_txt: Some("MoTrip & Rooz"), album: None, view_count: None, is_video: true, @@ -94,12 +91,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCJWteOVucKiI2Zy39jGoMZw", + ArtistId( + id: Some("UCJWteOVucKiI2Zy39jGoMZw"), name: "Kontra K", ), ], - artists_txt: Some("Kontra K"), album: None, view_count: None, is_video: true, @@ -117,12 +113,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC3MZNlOw72DZEeoBo7PzHEA", + ArtistId( + id: Some("UC3MZNlOw72DZEeoBo7PzHEA"), name: "Zuna", ), ], - artists_txt: Some("Zuna"), album: None, view_count: None, is_video: true, @@ -140,12 +135,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCZHCkx-08zBqSD1A1C5TWrA", + ArtistId( + id: Some("UCZHCkx-08zBqSD1A1C5TWrA"), name: "RAF Camora", ), ], - artists_txt: Some("RAF Camora"), album: None, view_count: None, is_video: true, @@ -163,12 +157,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCuA6k6g0Xzf6-JlgMXSSA0g", + ArtistId( + id: Some("UCuA6k6g0Xzf6-JlgMXSSA0g"), name: "Ufo361", ), ], - artists_txt: Some("Ufo361"), album: None, view_count: None, is_video: true, @@ -186,12 +179,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCeKm0uZEL5xCB57pNgOw7mg", + ArtistId( + id: Some("UCeKm0uZEL5xCB57pNgOw7mg"), name: "Dardan", ), ], - artists_txt: Some("Dardan"), album: None, view_count: None, is_video: true, @@ -209,12 +201,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCfKZwKZy9XFtHWPJMDYrmow", + ArtistId( + id: Some("UCfKZwKZy9XFtHWPJMDYrmow"), name: "YONII", ), ], - artists_txt: Some("YONII"), album: None, view_count: None, is_video: true, @@ -232,12 +223,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCx_r_19OjCTU93Koa2kFr1w", + ArtistId( + id: Some("UCx_r_19OjCTU93Koa2kFr1w"), name: "Anstandslos & Durchgeknallt", ), ], - artists_txt: Some("Anstandslos & Durchgeknallt"), album: None, view_count: None, is_video: true, @@ -255,12 +245,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCZHCkx-08zBqSD1A1C5TWrA", + ArtistId( + id: Some("UCZHCkx-08zBqSD1A1C5TWrA"), name: "RAF Camora", ), ], - artists_txt: Some("RAF Camora"), album: None, view_count: None, is_video: true, @@ -278,12 +267,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCwdy-QmH4y-gqjC8PMbKVVg", + ArtistId( + id: Some("UCwdy-QmH4y-gqjC8PMbKVVg"), name: "Olexesh", ), ], - artists_txt: Some("Olexesh"), album: None, view_count: None, is_video: true, @@ -301,12 +289,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCXUNYorrTVi7iG5FUnr-Gbg", + ArtistId( + id: Some("UCXUNYorrTVi7iG5FUnr-Gbg"), name: "Azet", ), ], - artists_txt: Some("Azet"), album: None, view_count: None, is_video: true, @@ -324,12 +311,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCAbiUl42boUt6vUL019r9Bw", + ArtistId( + id: Some("UCAbiUl42boUt6vUL019r9Bw"), name: "LifeisPainTv", ), ], - artists_txt: Some("LifeisPainTv"), album: None, view_count: None, is_video: true, @@ -347,12 +333,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCRU-s8cv-aOOuGXosCQ-hWA", + ArtistId( + id: Some("UCRU-s8cv-aOOuGXosCQ-hWA"), name: "Payy", ), ], - artists_txt: Some("Payy"), album: None, view_count: None, is_video: true, @@ -370,12 +355,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCXUNYorrTVi7iG5FUnr-Gbg", + ArtistId( + id: Some("UCXUNYorrTVi7iG5FUnr-Gbg"), name: "Azet", ), ], - artists_txt: Some("Azet"), album: None, view_count: None, is_video: true, @@ -393,12 +377,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCE7_p3lcXA-YXRZp2PjrgYw", + ArtistId( + id: Some("UCE7_p3lcXA-YXRZp2PjrgYw"), name: "Helene Fischer", ), ], - artists_txt: Some("Helene Fischer"), album: None, view_count: None, is_video: true, @@ -416,12 +399,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCeKm0uZEL5xCB57pNgOw7mg", + ArtistId( + id: Some("UCeKm0uZEL5xCB57pNgOw7mg"), name: "Dardan", ), ], - artists_txt: Some("Dardan"), album: None, view_count: None, is_video: true, @@ -439,12 +421,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCZHCkx-08zBqSD1A1C5TWrA", + ArtistId( + id: Some("UCZHCkx-08zBqSD1A1C5TWrA"), name: "RAF Camora", ), ], - artists_txt: Some("RAF Camora"), album: None, view_count: None, is_video: true, @@ -462,12 +443,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCaDQ6gDmX-hVFWz_SDb9GKg", + ArtistId( + id: Some("UCaDQ6gDmX-hVFWz_SDb9GKg"), name: "Sugar MMFK", ), ], - artists_txt: Some("Sugar MMFK"), album: None, view_count: None, is_video: true, @@ -485,12 +465,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCHOrIXuV6IFUS-cdHEwPYcg", + ArtistId( + id: Some("UCHOrIXuV6IFUS-cdHEwPYcg"), name: "Fler", ), ], - artists_txt: Some("Fler"), album: None, view_count: None, is_video: true, @@ -508,12 +487,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC7VGRS1q1XzHsAm1uM1PQ_Q", + ArtistId( + id: Some("UC7VGRS1q1XzHsAm1uM1PQ_Q"), name: "MGP", ), ], - artists_txt: Some("MGP"), album: None, view_count: None, is_video: true, @@ -531,12 +509,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCrWi76yRUDOyIkoM-3rst6g", + ArtistId( + id: Some("UCrWi76yRUDOyIkoM-3rst6g"), name: "RIN", ), ], - artists_txt: Some("RIN"), album: None, view_count: None, is_video: true, @@ -554,12 +531,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCrbdusWBqxVtEsktO3EfP3A", + ArtistId( + id: Some("UCrbdusWBqxVtEsktO3EfP3A"), name: "Glasperlenspiel", ), ], - artists_txt: Some("Glasperlenspiel"), album: None, view_count: None, is_video: true, @@ -577,12 +553,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCAbiUl42boUt6vUL019r9Bw", + ArtistId( + id: Some("UCAbiUl42boUt6vUL019r9Bw"), name: "LifeisPainTv", ), ], - artists_txt: Some("LifeisPainTv"), album: None, view_count: None, is_video: true, @@ -600,12 +575,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCZHCkx-08zBqSD1A1C5TWrA", + ArtistId( + id: Some("UCZHCkx-08zBqSD1A1C5TWrA"), name: "RAF Camora", ), ], - artists_txt: Some("RAF Camora"), album: None, view_count: None, is_video: true, @@ -623,12 +597,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCZHCkx-08zBqSD1A1C5TWrA", + ArtistId( + id: Some("UCZHCkx-08zBqSD1A1C5TWrA"), name: "RAF Camora", ), ], - artists_txt: Some("RAF Camora"), album: None, view_count: None, is_video: true, @@ -646,12 +619,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCJWteOVucKiI2Zy39jGoMZw", + ArtistId( + id: Some("UCJWteOVucKiI2Zy39jGoMZw"), name: "Kontra K", ), ], - artists_txt: Some("Kontra K"), album: None, view_count: None, is_video: true, @@ -669,12 +641,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCZHCkx-08zBqSD1A1C5TWrA", + ArtistId( + id: Some("UCZHCkx-08zBqSD1A1C5TWrA"), name: "RAF Camora", ), ], - artists_txt: Some("RAF Camora"), album: None, view_count: None, is_video: true, @@ -692,12 +663,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCupgfYuFD4-0Rq7yPIVDLtA", + ArtistId( + id: Some("UCupgfYuFD4-0Rq7yPIVDLtA"), name: "Fard", ), ], - artists_txt: Some("Fard"), album: None, view_count: None, is_video: true, @@ -715,12 +685,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UChewMSJ_RAvnoPqMyJZ95_g", + ArtistId( + id: Some("UChewMSJ_RAvnoPqMyJZ95_g"), name: "18 Karat", ), ], - artists_txt: Some("18 Karat"), album: None, view_count: None, is_video: true, @@ -738,12 +707,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCrWi76yRUDOyIkoM-3rst6g", + ArtistId( + id: Some("UCrWi76yRUDOyIkoM-3rst6g"), name: "RIN", ), ], - artists_txt: Some("RIN"), album: None, view_count: None, is_video: true, @@ -761,12 +729,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCE7_p3lcXA-YXRZp2PjrgYw", + ArtistId( + id: Some("UCE7_p3lcXA-YXRZp2PjrgYw"), name: "Helene Fischer", ), ], - artists_txt: Some("Helene Fischer"), album: None, view_count: None, is_video: true, @@ -784,12 +751,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCAbiUl42boUt6vUL019r9Bw", + ArtistId( + id: Some("UCAbiUl42boUt6vUL019r9Bw"), name: "LifeisPainTv", ), ], - artists_txt: Some("LifeisPainTv"), album: None, view_count: None, is_video: true, @@ -807,16 +773,15 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCr-f5ECZ7DCJk7ygmEij1HA", + ArtistId( + id: Some("UCr-f5ECZ7DCJk7ygmEij1HA"), name: "Abdi", ), - ChannelId( - id: "UC8Bnfb1ULvFNIK-asnJ68rQ", + ArtistId( + id: Some("UC8Bnfb1ULvFNIK-asnJ68rQ"), name: "CELO", ), ], - artists_txt: Some("Abdi & CELO"), album: None, view_count: None, is_video: true, @@ -833,8 +798,12 @@ Paginator( height: 225, ), ], - artists: [], - artists_txt: Some("Damestream Records"), + artists: [ + ArtistId( + id: None, + name: "Damestream Records", + ), + ], album: None, view_count: None, is_video: true, @@ -852,16 +821,15 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC8gxc2fYnL1tHPOXHXyI6sQ", + ArtistId( + id: Some("UC8gxc2fYnL1tHPOXHXyI6sQ"), name: "Bonez MC", ), - ChannelId( - id: "UCVvL70F5a_APtKzTjGb2L0w", + ArtistId( + id: Some("UCVvL70F5a_APtKzTjGb2L0w"), name: "Gzuz", ), ], - artists_txt: Some("Bonez MC & Gzuz"), album: None, view_count: None, is_video: true, @@ -879,12 +847,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCO8_DFkr_fn_YDup_7OZNow", + ArtistId( + id: Some("UCO8_DFkr_fn_YDup_7OZNow"), name: "El Cartel Music", ), ], - artists_txt: Some("El Cartel Music"), album: None, view_count: None, is_video: true, @@ -902,16 +869,15 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCQpUg11TCB1eLGO1f59Ce6Q", + ArtistId( + id: Some("UCQpUg11TCB1eLGO1f59Ce6Q"), name: "King Khalil", ), - ChannelId( - id: "UCa7FGSUsN2wNRUclibmicMg", + ArtistId( + id: Some("UCa7FGSUsN2wNRUclibmicMg"), name: "Capital Bra", ), ], - artists_txt: Some("King Khalil & Capital Bra"), album: None, view_count: None, is_video: true, @@ -929,16 +895,15 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC8gxc2fYnL1tHPOXHXyI6sQ", + ArtistId( + id: Some("UC8gxc2fYnL1tHPOXHXyI6sQ"), name: "Bonez MC", ), - ChannelId( - id: "UCVvL70F5a_APtKzTjGb2L0w", + ArtistId( + id: Some("UCVvL70F5a_APtKzTjGb2L0w"), name: "Gzuz", ), ], - artists_txt: Some("Bonez MC & Gzuz"), album: None, view_count: None, is_video: true, @@ -956,12 +921,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCuA6k6g0Xzf6-JlgMXSSA0g", + ArtistId( + id: Some("UCuA6k6g0Xzf6-JlgMXSSA0g"), name: "Ufo361", ), ], - artists_txt: Some("Ufo361"), album: None, view_count: None, is_video: true, @@ -979,12 +943,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCDOMU7d2xhTF90FFzij3kgg", + ArtistId( + id: Some("UCDOMU7d2xhTF90FFzij3kgg"), name: "Die Toten Hosen", ), ], - artists_txt: Some("Die Toten Hosen"), album: None, view_count: None, is_video: true, @@ -1002,12 +965,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCXDkh6v5SI-Y5W-9nGcV8FA", + ArtistId( + id: Some("UCXDkh6v5SI-Y5W-9nGcV8FA"), name: "Wincent Weiss", ), ], - artists_txt: Some("Wincent Weiss"), album: None, view_count: None, is_video: true, @@ -1025,12 +987,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCriUQh7BGZUop8BW4ZTx7Lg", + ArtistId( + id: Some("UCriUQh7BGZUop8BW4ZTx7Lg"), name: "Eunique", ), ], - artists_txt: Some("Eunique"), album: None, view_count: None, is_video: true, @@ -1048,12 +1009,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCv83kiz_XGb4rfO0CXxzn5A", + ArtistId( + id: Some("UCv83kiz_XGb4rfO0CXxzn5A"), name: "King Khalil", ), ], - artists_txt: Some("King Khalil"), album: None, view_count: None, is_video: true, @@ -1071,12 +1031,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCQCDX-NwtNYXcRaVRCmIZKw", + ArtistId( + id: Some("UCQCDX-NwtNYXcRaVRCmIZKw"), name: "Luciano", ), ], - artists_txt: Some("Luciano"), album: None, view_count: None, is_video: true, @@ -1094,12 +1053,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCVvL70F5a_APtKzTjGb2L0w", + ArtistId( + id: Some("UCVvL70F5a_APtKzTjGb2L0w"), name: "Gzuz", ), ], - artists_txt: Some("Gzuz"), album: None, view_count: None, is_video: true, @@ -1117,12 +1075,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCmhABfwtPqVfEcn0aKpMRaw", + ArtistId( + id: Some("UCmhABfwtPqVfEcn0aKpMRaw"), name: "Veysel", ), ], - artists_txt: Some("Veysel"), album: None, view_count: None, is_video: true, @@ -1140,16 +1097,15 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC8gxc2fYnL1tHPOXHXyI6sQ", + ArtistId( + id: Some("UC8gxc2fYnL1tHPOXHXyI6sQ"), name: "Bonez MC", ), - ChannelId( - id: "UCZHCkx-08zBqSD1A1C5TWrA", + ArtistId( + id: Some("UCZHCkx-08zBqSD1A1C5TWrA"), name: "RAF Camora", ), ], - artists_txt: Some("Bonez MC & RAF Camora"), album: None, view_count: None, is_video: true, @@ -1167,12 +1123,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCfKZwKZy9XFtHWPJMDYrmow", + ArtistId( + id: Some("UCfKZwKZy9XFtHWPJMDYrmow"), name: "YONII", ), ], - artists_txt: Some("YONII"), album: None, view_count: None, is_video: true, @@ -1190,12 +1145,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCjWIuu9eZlxQaFgLZfQx7CA", + ArtistId( + id: Some("UCjWIuu9eZlxQaFgLZfQx7CA"), name: "Mert", ), ], - artists_txt: Some("Mert"), album: None, view_count: None, is_video: true, @@ -1213,12 +1167,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCFNSyezyK_1_f0nOrNaCdHQ", + ArtistId( + id: Some("UCFNSyezyK_1_f0nOrNaCdHQ"), name: "SXTN", ), ], - artists_txt: Some("SXTN"), album: None, view_count: None, is_video: true, @@ -1236,12 +1189,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCkQRXVZuBMktEdVyptoUgGg", + ArtistId( + id: Some("UCkQRXVZuBMktEdVyptoUgGg"), name: "Mark Forster", ), ], - artists_txt: Some("Mark Forster"), album: None, view_count: None, is_video: true, @@ -1259,12 +1211,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCDLPHv0SrvyUzct8UYQ9R_g", + ArtistId( + id: Some("UCDLPHv0SrvyUzct8UYQ9R_g"), name: "KMNGANG", ), ], - artists_txt: Some("KMNGANG"), album: None, view_count: None, is_video: true, @@ -1282,12 +1233,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCVvL70F5a_APtKzTjGb2L0w", + ArtistId( + id: Some("UCVvL70F5a_APtKzTjGb2L0w"), name: "Gzuz", ), ], - artists_txt: Some("Gzuz"), album: None, view_count: None, is_video: true, @@ -1305,12 +1255,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCs6GGpd9zvsYghuYe0VDFUQ", + ArtistId( + id: Some("UCs6GGpd9zvsYghuYe0VDFUQ"), name: "Rammstein", ), ], - artists_txt: Some("Rammstein"), album: None, view_count: None, is_video: true, @@ -1328,12 +1277,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCgosMU69MpoCqhuS1JZj6Cw", + ArtistId( + id: Some("UCgosMU69MpoCqhuS1JZj6Cw"), name: "Sido", ), ], - artists_txt: Some("Sido"), album: None, view_count: None, is_video: true, @@ -1351,12 +1299,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCcyO_SNHFhbdogh9PPBB9LA", + ArtistId( + id: Some("UCcyO_SNHFhbdogh9PPBB9LA"), name: "MoTrip", ), ], - artists_txt: Some("MoTrip"), album: None, view_count: None, is_video: true, @@ -1374,12 +1321,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCJjgJI2vEDxGZYbQ_-2ZGXQ", + ArtistId( + id: Some("UCJjgJI2vEDxGZYbQ_-2ZGXQ"), name: "Adel Tawil", ), ], - artists_txt: Some("Adel Tawil"), album: None, view_count: None, is_video: true, @@ -1397,12 +1343,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCicJjripVxiTXbUfociVZwQ", + ArtistId( + id: Some("UCicJjripVxiTXbUfociVZwQ"), name: "MARTERIA", ), ], - artists_txt: Some("MARTERIA"), album: None, view_count: None, is_video: true, @@ -1420,12 +1365,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC5k_3LEPSGchsGEGpqoF6dg", + ArtistId( + id: Some("UC5k_3LEPSGchsGEGpqoF6dg"), name: "K.I.Z", ), ], - artists_txt: Some("K.I.Z"), album: None, view_count: None, is_video: true, @@ -1443,12 +1387,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCEHalRyK7ZSFafTtAn3uYIA", + ArtistId( + id: Some("UCEHalRyK7ZSFafTtAn3uYIA"), name: "Max Giesinger", ), ], - artists_txt: Some("Max Giesinger"), album: None, view_count: None, is_video: true, @@ -1466,12 +1409,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCkQRXVZuBMktEdVyptoUgGg", + ArtistId( + id: Some("UCkQRXVZuBMktEdVyptoUgGg"), name: "Mark Forster", ), ], - artists_txt: Some("Mark Forster"), album: None, view_count: None, is_video: true, @@ -1489,12 +1431,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCcgml_Q7npEKVGM2bSksWBA", + ArtistId( + id: Some("UCcgml_Q7npEKVGM2bSksWBA"), name: "Tim Bendzko", ), ], - artists_txt: Some("Tim Bendzko"), album: None, view_count: None, is_video: true, @@ -1512,12 +1453,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCT7MCko43YqeZ1x55O1DRtw", + ArtistId( + id: Some("UCT7MCko43YqeZ1x55O1DRtw"), name: "deichkindTV", ), ], - artists_txt: Some("deichkindTV"), album: None, view_count: None, is_video: true, @@ -1535,12 +1475,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCqsyOBd31LT-EwwqiSBKxSA", + ArtistId( + id: Some("UCqsyOBd31LT-EwwqiSBKxSA"), name: "pop-out Musik", ), ], - artists_txt: Some("pop-out Musik"), album: None, view_count: None, is_video: true, @@ -1558,12 +1497,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCXUNYorrTVi7iG5FUnr-Gbg", + ArtistId( + id: Some("UCXUNYorrTVi7iG5FUnr-Gbg"), name: "Azet", ), ], - artists_txt: Some("Azet"), album: None, view_count: None, is_video: true, @@ -1581,12 +1519,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCACOVSEb3DGote2ZHZx6jHw", + ArtistId( + id: Some("UCACOVSEb3DGote2ZHZx6jHw"), name: "KC Rebell", ), ], - artists_txt: Some("KC Rebell"), album: None, view_count: None, is_video: true, @@ -1604,12 +1541,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCkQRXVZuBMktEdVyptoUgGg", + ArtistId( + id: Some("UCkQRXVZuBMktEdVyptoUgGg"), name: "Mark Forster", ), ], - artists_txt: Some("Mark Forster"), album: None, view_count: None, is_video: true, @@ -1627,16 +1563,15 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC9-2io8F6puEBsQZ8uCQ1qw", + ArtistId( + id: Some("UC9-2io8F6puEBsQZ8uCQ1qw"), name: "Cheat Codes", ), - ChannelId( - id: "UCPV7kPtFBhHOJbjmWlX85SQ", + ArtistId( + id: Some("UCPV7kPtFBhHOJbjmWlX85SQ"), name: "Kris Kross Amsterdam", ), ], - artists_txt: Some("Cheat Codes & Kris Kross Amsterdam"), album: None, view_count: None, is_video: true, @@ -1654,12 +1589,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCVvL70F5a_APtKzTjGb2L0w", + ArtistId( + id: Some("UCVvL70F5a_APtKzTjGb2L0w"), name: "Gzuz", ), ], - artists_txt: Some("Gzuz"), album: None, view_count: None, is_video: true, @@ -1677,12 +1611,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC3MZNlOw72DZEeoBo7PzHEA", + ArtistId( + id: Some("UC3MZNlOw72DZEeoBo7PzHEA"), name: "Zuna", ), ], - artists_txt: Some("Zuna"), album: None, view_count: None, is_video: true, @@ -1700,12 +1633,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCnH4k3ASwytYAgfsW83OvTg", + ArtistId( + id: Some("UCnH4k3ASwytYAgfsW83OvTg"), name: "Azzlackz", ), ], - artists_txt: Some("Azzlackz"), album: None, view_count: None, is_video: true, @@ -1723,12 +1655,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCeKm0uZEL5xCB57pNgOw7mg", + ArtistId( + id: Some("UCeKm0uZEL5xCB57pNgOw7mg"), name: "Dardan", ), ], - artists_txt: Some("Dardan"), album: None, view_count: None, is_video: true, @@ -1746,12 +1677,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCJjgJI2vEDxGZYbQ_-2ZGXQ", + ArtistId( + id: Some("UCJjgJI2vEDxGZYbQ_-2ZGXQ"), name: "Adel Tawil", ), ], - artists_txt: Some("Adel Tawil"), album: None, view_count: None, is_video: true, @@ -1769,12 +1699,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCwdy-QmH4y-gqjC8PMbKVVg", + ArtistId( + id: Some("UCwdy-QmH4y-gqjC8PMbKVVg"), name: "Olexesh", ), ], - artists_txt: Some("Olexesh"), album: None, view_count: None, is_video: true, @@ -1792,12 +1721,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCgosMU69MpoCqhuS1JZj6Cw", + ArtistId( + id: Some("UCgosMU69MpoCqhuS1JZj6Cw"), name: "Sido", ), ], - artists_txt: Some("Sido"), album: None, view_count: None, is_video: true, @@ -1815,12 +1743,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCwoO85C8_Pzq-2ek7x53Y9Q", + ArtistId( + id: Some("UCwoO85C8_Pzq-2ek7x53Y9Q"), name: "Philipp Poisel", ), ], - artists_txt: Some("Philipp Poisel"), album: None, view_count: None, is_video: true, @@ -1838,12 +1765,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCGh8tmH9x9njaI2mXfh2fyg", + ArtistId( + id: Some("UCGh8tmH9x9njaI2mXfh2fyg"), name: "CrhymeTV", ), ], - artists_txt: Some("CrhymeTV"), album: None, view_count: None, is_video: true, @@ -1861,16 +1787,15 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCyavaV4GE4o3jW1X4k55fLA", + ArtistId( + id: Some("UCyavaV4GE4o3jW1X4k55fLA"), name: "Bushido", ), - ChannelId( - id: "UCclvs9lPYVhUNaJd4hWPEgg", + ArtistId( + id: Some("UCclvs9lPYVhUNaJd4hWPEgg"), name: "Shindy", ), ], - artists_txt: Some("Bushido & Shindy"), album: None, view_count: None, is_video: true, @@ -1888,12 +1813,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCLmyWpIwbKr6HJQ_teYCkVw", + ArtistId( + id: Some("UCLmyWpIwbKr6HJQ_teYCkVw"), name: "Kollegah", ), ], - artists_txt: Some("Kollegah"), album: None, view_count: None, is_video: true, @@ -1911,12 +1835,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCLmyWpIwbKr6HJQ_teYCkVw", + ArtistId( + id: Some("UCLmyWpIwbKr6HJQ_teYCkVw"), name: "Kollegah", ), ], - artists_txt: Some("Kollegah"), album: None, view_count: None, is_video: true, @@ -1934,12 +1857,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCUtLzBYwbDWCbZpZ5qkMLwQ", + ArtistId( + id: Some("UCUtLzBYwbDWCbZpZ5qkMLwQ"), name: "Philipp Dittberner", ), ], - artists_txt: Some("Philipp Dittberner"), album: None, view_count: None, is_video: true, @@ -1957,12 +1879,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCkUwPD973AomSmANZuoCrfg", + ArtistId( + id: Some("UCkUwPD973AomSmANZuoCrfg"), name: "SpongeBOZZ", ), ], - artists_txt: Some("SpongeBOZZ"), album: None, view_count: None, is_video: true, @@ -1980,12 +1901,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCg9Mw2YNnXqrecKl4bKLVCQ", + ArtistId( + id: Some("UCg9Mw2YNnXqrecKl4bKLVCQ"), name: "80smusicfanman", ), ], - artists_txt: Some("80smusicfanman"), album: None, view_count: None, is_video: true, @@ -2003,12 +1923,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCDvquKlXAy3pY4dFwj3QKtw", + ArtistId( + id: Some("UCDvquKlXAy3pY4dFwj3QKtw"), name: "Genetikk", ), ], - artists_txt: Some("Genetikk"), album: None, view_count: None, is_video: true, @@ -2026,12 +1945,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCXGYZ-OhdOpPBamHX3K9YRg", + ArtistId( + id: Some("UCXGYZ-OhdOpPBamHX3K9YRg"), name: "Joel Brandenstein", ), ], - artists_txt: Some("Joel Brandenstein"), album: None, view_count: None, is_video: true, @@ -2049,16 +1967,15 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCLmyWpIwbKr6HJQ_teYCkVw", + ArtistId( + id: Some("UCLmyWpIwbKr6HJQ_teYCkVw"), name: "Kollegah", ), - ChannelId( - id: "UC4gi504gkSyoXt9vfaGUr9A", + ArtistId( + id: Some("UC4gi504gkSyoXt9vfaGUr9A"), name: "Farid Bang", ), ], - artists_txt: Some("Kollegah & Farid Bang"), album: None, view_count: None, is_video: true, @@ -2076,12 +1993,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCACOVSEb3DGote2ZHZx6jHw", + ArtistId( + id: Some("UCACOVSEb3DGote2ZHZx6jHw"), name: "KC Rebell", ), ], - artists_txt: Some("KC Rebell"), album: None, view_count: None, is_video: true, @@ -2099,12 +2015,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCvnCXuh_zhm75EJ89qJ95Kw", + ArtistId( + id: Some("UCvnCXuh_zhm75EJ89qJ95Kw"), name: "385idéal", ), ], - artists_txt: Some("385idéal"), album: None, view_count: None, is_video: true, @@ -2122,12 +2037,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCgosMU69MpoCqhuS1JZj6Cw", + ArtistId( + id: Some("UCgosMU69MpoCqhuS1JZj6Cw"), name: "Sido", ), ], - artists_txt: Some("Sido"), album: None, view_count: None, is_video: true, @@ -2145,12 +2059,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCUQY0RLnpERvFlTCtzdU3Xg", + ArtistId( + id: Some("UCUQY0RLnpERvFlTCtzdU3Xg"), name: "JuliensBlog", ), ], - artists_txt: Some("JuliensBlog"), album: None, view_count: None, is_video: true, @@ -2168,12 +2081,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCAOPSjipxqxXk5mctGHiUoQ", + ArtistId( + id: Some("UCAOPSjipxqxXk5mctGHiUoQ"), name: "Kurdo", ), ], - artists_txt: Some("Kurdo"), album: None, view_count: None, is_video: true, @@ -2191,16 +2103,15 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC2-YEIq9n-IH6eUMqzEWAaQ", + ArtistId( + id: Some("UC2-YEIq9n-IH6eUMqzEWAaQ"), name: "MC Yankoo", ), - ChannelId( - id: "UCWa9AoWdpNpEvDVoi62rITg", + ArtistId( + id: Some("UCWa9AoWdpNpEvDVoi62rITg"), name: "Milica Todorović", ), ], - artists_txt: Some("MC Yankoo & Milica Todorović"), album: None, view_count: None, is_video: true, @@ -2218,12 +2129,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCK2ZLsY9Mb_dxZiZfKE3lGg", + ArtistId( + id: Some("UCK2ZLsY9Mb_dxZiZfKE3lGg"), name: "AnnenMayKantereit", ), ], - artists_txt: Some("AnnenMayKantereit"), album: None, view_count: None, is_video: true, @@ -2241,12 +2151,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCcV2StZKkutS-1GsgL-XobQ", + ArtistId( + id: Some("UCcV2StZKkutS-1GsgL-XobQ"), name: "Prinz Pi", ), ], - artists_txt: Some("Prinz Pi"), album: None, view_count: None, is_video: true, @@ -2264,12 +2173,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCiBODJaGfd1aBHE7BF_Iv7w", + ArtistId( + id: Some("UCiBODJaGfd1aBHE7BF_Iv7w"), name: "Nimo", ), ], - artists_txt: Some("Nimo"), album: None, view_count: None, is_video: true, @@ -2287,12 +2195,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCiBODJaGfd1aBHE7BF_Iv7w", + ArtistId( + id: Some("UCiBODJaGfd1aBHE7BF_Iv7w"), name: "Nimo", ), ], - artists_txt: Some("Nimo"), album: None, view_count: None, is_video: true, @@ -2310,12 +2217,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCAbxL0lZcmlaQrzoUbrvS3A", + ArtistId( + id: Some("UCAbxL0lZcmlaQrzoUbrvS3A"), name: "SDP", ), ], - artists_txt: Some("SDP"), album: None, view_count: None, is_video: true, @@ -2333,16 +2239,15 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCqG3KFVWvCPCtKzEYifV5Ew", + ArtistId( + id: Some("UCqG3KFVWvCPCtKzEYifV5Ew"), name: "Maxwell", ), - ChannelId( - id: "UC_oDmJUkrvH5UAWsHFFD3Kw", + ArtistId( + id: Some("UC_oDmJUkrvH5UAWsHFFD3Kw"), name: "LX", ), ], - artists_txt: Some("Maxwell & LX"), album: None, view_count: None, is_video: true, diff --git a/src/client/snapshots/rustypipe__client__pagination__tests__map_search_tracks.snap b/src/client/snapshots/rustypipe__client__pagination__tests__map_search_tracks.snap index b46189d..ad96305 100644 --- a/src/client/snapshots/rustypipe__client__pagination__tests__map_search_tracks.snap +++ b/src/client/snapshots/rustypipe__client__pagination__tests__map_search_tracks.snap @@ -22,12 +22,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCxoJ3pl32f39kmTvIR_NWOg", + ArtistId( + id: Some("UCxoJ3pl32f39kmTvIR_NWOg"), name: "Akae Beka", ), ], - artists_txt: Some("Akae Beka"), album: Some(AlbumId( id: "MPREb_iuN0lQwEmRp", name: "Kings Dub", @@ -53,12 +52,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCz7CQ4Mn9VChcO5-8j0SZpQ", + ArtistId( + id: Some("UCz7CQ4Mn9VChcO5-8j0SZpQ"), name: "Stylophonic", ), ], - artists_txt: Some("Stylophonic"), album: Some(AlbumId( id: "MPREb_HOsmtxbCHyg", name: "Boom!", @@ -84,12 +82,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCAlOD5s3Ro27M61-2Z_UB7w", + ArtistId( + id: Some("UCAlOD5s3Ro27M61-2Z_UB7w"), name: "Tee See Connection", ), ], - artists_txt: Some("Tee See Connection"), album: Some(AlbumId( id: "MPREb_yrsxU7t0h6l", name: "Black Mamba", @@ -115,12 +112,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCJv4icVpfpTaKZcB_Bytxyw", + ArtistId( + id: Some("UCJv4icVpfpTaKZcB_Bytxyw"), name: "Bravoo Hunnidz", ), ], - artists_txt: Some("Bravoo Hunnidz"), album: Some(AlbumId( id: "MPREb_7Bg4fukodPY", name: "Ballin\' Like I\'m Kobe", @@ -146,12 +142,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC7RJTtpE3qwbw6-Idq9PTIg", + ArtistId( + id: Some("UC7RJTtpE3qwbw6-Idq9PTIg"), name: "Shockwave-Sound", ), ], - artists_txt: Some("Shockwave-Sound"), album: Some(AlbumId( id: "MPREb_Kg4Ff883GH0", name: "Out on the Road", @@ -177,12 +172,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCh4Y9bvt_6vDq1gQhhT8AdA", + ArtistId( + id: Some("UCh4Y9bvt_6vDq1gQhhT8AdA"), name: "Solo Da Honcho", ), ], - artists_txt: Some("Solo Da Honcho"), album: Some(AlbumId( id: "MPREb_fmNpLFKg4BY", name: "Black Mamba", @@ -208,12 +202,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCRpi1gBlax4sK3dNNxIxxFg", + ArtistId( + id: Some("UCRpi1gBlax4sK3dNNxIxxFg"), name: "Black Mamba Official", ), ], - artists_txt: Some("Black Mamba Official"), album: Some(AlbumId( id: "MPREb_zMwHYnQRmuP", name: "Born To Fight", @@ -238,8 +231,12 @@ Paginator( height: 120, ), ], - artists: [], - artists_txt: Some("Dollah"), + artists: [ + ArtistId( + id: None, + name: "Dollah", + ), + ], album: Some(AlbumId( id: "MPREb_5mxIz2hChjd", name: "Black Mamba", @@ -265,12 +262,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCEdZAdnnKqbaHOlv8nM6OtA", + ArtistId( + id: Some("UCEdZAdnnKqbaHOlv8nM6OtA"), name: "aespa", ), ], - artists_txt: Some("aespa"), album: Some(AlbumId( id: "MPREb_ThKZWN8DQwp", name: "Savage - The 1st Mini Album", @@ -296,12 +292,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCQSz-Rhz_ew4hUprXww4PAA", + ArtistId( + id: Some("UCQSz-Rhz_ew4hUprXww4PAA"), name: "Crystal Ignite", ), ], - artists_txt: Some("Crystal Ignite"), album: Some(AlbumId( id: "MPREb_E29fqYqQp2V", name: "Black Mamba", @@ -326,8 +321,12 @@ Paginator( height: 120, ), ], - artists: [], - artists_txt: Some("Izhha, yasom, Samu, Ritmo, and Dcibel"), + artists: [ + ArtistId( + id: None, + name: "Izhha, yasom, Samu, Ritmo, and Dcibel", + ), + ], album: Some(AlbumId( id: "MPREb_PokIWXXD0EX", name: "Black Mamba", @@ -353,12 +352,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCuDH6EntL5Qx9YrQCZSFiPg", + ArtistId( + id: Some("UCuDH6EntL5Qx9YrQCZSFiPg"), name: "Jeroenski", ), ], - artists_txt: Some("Jeroenski"), album: Some(AlbumId( id: "MPREb_NjnY9xgK1OH", name: "Urban Vibes (The Underground Sound of House Music, Vol. 9)", @@ -384,12 +382,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCRpi1gBlax4sK3dNNxIxxFg", + ArtistId( + id: Some("UCRpi1gBlax4sK3dNNxIxxFg"), name: "Black Mamba Official", ), ], - artists_txt: Some("Black Mamba Official"), album: Some(AlbumId( id: "MPREb_TyaTgucQuuW", name: "Soul Surrender", @@ -415,12 +412,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCdkNrc_l73BHYKRhDqxBo9w", + ArtistId( + id: Some("UCdkNrc_l73BHYKRhDqxBo9w"), name: "Black Mamba Man", ), ], - artists_txt: Some("Black Mamba Man"), album: Some(AlbumId( id: "MPREb_VDjWCOUvD7s", name: "Anti Venom", @@ -446,12 +442,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCiS97__D2VSNbDMfajnkTkw", + ArtistId( + id: Some("UCiS97__D2VSNbDMfajnkTkw"), name: "Liapin", ), ], - artists_txt: Some("Liapin"), album: Some(AlbumId( id: "MPREb_TQJZCrJZ9cZ", name: "Basila", @@ -477,20 +472,19 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC3z_UqNGLnKLHfBDONx82zQ", + ArtistId( + id: Some("UC3z_UqNGLnKLHfBDONx82zQ"), name: "Romane, Stochelo Rosenberg", ), - ChannelId( - id: "UCPrlkPZfsIoN6QG-jDRYQkQ", + ArtistId( + id: Some("UCPrlkPZfsIoN6QG-jDRYQkQ"), name: "Romane", ), - ChannelId( - id: "UCmsTxLepDwdzr07-ALKUEHw", + ArtistId( + id: Some("UCmsTxLepDwdzr07-ALKUEHw"), name: "Stochelo Rosenberg", ), ], - artists_txt: Some("Romane, Stochelo Rosenberg, Romane & Stochelo Rosenberg"), album: Some(AlbumId( id: "MPREb_RFMbAhqPjqV", name: "Double jeu (Intégrale Romane, vol. 9)", @@ -516,12 +510,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC2wd_7GTMGiQjIb6wCwnLhQ", + ArtistId( + id: Some("UC2wd_7GTMGiQjIb6wCwnLhQ"), name: "Hangmen", ), ], - artists_txt: Some("Hangmen"), album: Some(AlbumId( id: "MPREb_fEAazqatkfR", name: "Singapore Slingers", @@ -547,12 +540,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCXQvoNpH-EDGUnCe2ABldDg", + ArtistId( + id: Some("UCXQvoNpH-EDGUnCe2ABldDg"), name: "Two Tone Club", ), ], - artists_txt: Some("Two Tone Club"), album: Some(AlbumId( id: "MPREb_ksEm4DleWYg", name: "Don\'t Look Back", @@ -578,12 +570,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UCPjjr_AvPvEhZ5nnzEACI4w", + ArtistId( + id: Some("UCPjjr_AvPvEhZ5nnzEACI4w"), name: "Adrian Raso", ), ], - artists_txt: Some("Adrian Raso"), album: Some(AlbumId( id: "MPREb_Ws191BQ8IqM", name: "Black Mamba", @@ -609,12 +600,11 @@ Paginator( ), ], artists: [ - ChannelId( - id: "UC_GZYnrfgYfORwOb2MsuyIg", + ArtistId( + id: Some("UC_GZYnrfgYfORwOb2MsuyIg"), name: "Tunde", ), ], - artists_txt: Some("Tunde"), album: Some(AlbumId( id: "MPREb_5VuPA4DLi53", name: "Black Mamba Style", diff --git a/src/model/mod.rs b/src/model/mod.rs index cdbd2dd..b57e069 100644 --- a/src/model/mod.rs +++ b/src/model/mod.rs @@ -930,6 +930,8 @@ pub struct AlbumItem { pub album_type: AlbumType, /// Release year of the album pub year: Option, + /// Is the album by 'Various artists'? + pub by_va: bool, } /// YouTube Music playlist list item diff --git a/src/serializer/text.rs b/src/serializer/text.rs index a21e734..e00d8a3 100644 --- a/src/serializer/text.rs +++ b/src/serializer/text.rs @@ -325,6 +325,39 @@ impl TryFrom for crate::model::AlbumId { } } +impl From for crate::model::ArtistId { + fn from(component: TextComponent) -> Self { + match component { + TextComponent::Browse { + text, + page_type, + browse_id, + } => match page_type { + PageType::Channel | PageType::Artist => Self { + id: Some(browse_id), + name: text, + }, + _ => Self { + id: None, + name: text, + }, + }, + TextComponent::Video { text, .. } => Self { + id: None, + name: text, + }, + TextComponent::Web { text, .. } => Self { + id: None, + name: text, + }, + TextComponent::Text { text } => Self { + id: None, + name: text, + }, + } + } +} + impl From for crate::model::richtext::TextComponent { fn from(component: TextComponent) -> Self { match component { @@ -374,16 +407,6 @@ impl TextComponent { } impl TextComponents { - /// Return the string representation of all text components - /// or [`None`] if there aren't any. - pub fn to_opt_string(&self) -> Option { - if self.0.is_empty() { - None - } else { - Some(self.to_string()) - } - } - /// Return the string representation of the first text component pub fn first_str(&self) -> &str { self.0.first().map(|t| t.as_str()).unwrap_or_default() diff --git a/tests/snapshots/youtube__music_album_audiobook.snap b/tests/snapshots/youtube__music_album_audiobook.snap index fd02699..015b82e 100644 --- a/tests/snapshots/youtube__music_album_audiobook.snap +++ b/tests/snapshots/youtube__music_album_audiobook.snap @@ -7,8 +7,16 @@ MusicAlbum( playlist_id: Some("OLAK5uy_k7u7GK3VF2l5tCdMEyksYRibZvTxLDcVY"), name: "1984", cover: "[cover]", - artists: [], - artists_txt: "George Orwell & Dirk Jacobs", + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], album_type: Audiobook, year: Some(2022), by_va: false, @@ -18,11 +26,22 @@ MusicAlbum( title: "Kapitel 1.1 - 1984", duration: 131, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(1), ), TrackItem( @@ -30,11 +49,22 @@ MusicAlbum( title: "Kapitel 1.2 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(2), ), TrackItem( @@ -42,11 +72,22 @@ MusicAlbum( title: "Kapitel 1.3 - 1984", duration: 129, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(3), ), TrackItem( @@ -54,11 +95,22 @@ MusicAlbum( title: "Kapitel 1.4 - 1984", duration: 141, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(4), ), TrackItem( @@ -66,11 +118,22 @@ MusicAlbum( title: "Kapitel 1.5 - 1984", duration: 134, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(5), ), TrackItem( @@ -78,11 +141,22 @@ MusicAlbum( title: "Kapitel 1.6 - 1984", duration: 135, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(6), ), TrackItem( @@ -90,11 +164,22 @@ MusicAlbum( title: "Kapitel 1.7 - 1984", duration: 129, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(7), ), TrackItem( @@ -102,11 +187,22 @@ MusicAlbum( title: "Kapitel 1.8 - 1984", duration: 140, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(8), ), TrackItem( @@ -114,11 +210,22 @@ MusicAlbum( title: "Kapitel 1.9 - 1984", duration: 178, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(9), ), TrackItem( @@ -126,11 +233,22 @@ MusicAlbum( title: "Kapitel 1.10 - 1984", duration: 138, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(10), ), TrackItem( @@ -138,11 +256,22 @@ MusicAlbum( title: "Kapitel 1.11 - 1984", duration: 126, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(11), ), TrackItem( @@ -150,11 +279,22 @@ MusicAlbum( title: "Kapitel 1.12 - 1984", duration: 133, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(12), ), TrackItem( @@ -162,11 +302,22 @@ MusicAlbum( title: "Kapitel 1.13 - 1984", duration: 134, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(13), ), TrackItem( @@ -174,11 +325,22 @@ MusicAlbum( title: "Kapitel 1.14 - 1984", duration: 154, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(14), ), TrackItem( @@ -186,11 +348,22 @@ MusicAlbum( title: "Kapitel 1.15 - 1984", duration: 139, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(15), ), TrackItem( @@ -198,11 +371,22 @@ MusicAlbum( title: "Kapitel 1.16 - 1984", duration: 127, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(16), ), TrackItem( @@ -210,11 +394,22 @@ MusicAlbum( title: "Kapitel 1.17 - 1984", duration: 140, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(17), ), TrackItem( @@ -222,11 +417,22 @@ MusicAlbum( title: "Kapitel 1.18 - 1984", duration: 141, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(18), ), TrackItem( @@ -234,11 +440,22 @@ MusicAlbum( title: "Kapitel 1.19 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(19), ), TrackItem( @@ -246,11 +463,22 @@ MusicAlbum( title: "Kapitel 1.20 - 1984", duration: 138, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(20), ), TrackItem( @@ -258,11 +486,22 @@ MusicAlbum( title: "Kapitel 1.21 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(21), ), TrackItem( @@ -270,11 +509,22 @@ MusicAlbum( title: "Kapitel 1.22 & Kapitel 2.1 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(22), ), TrackItem( @@ -282,11 +532,22 @@ MusicAlbum( title: "Kapitel 2.2 - 1984", duration: 153, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(23), ), TrackItem( @@ -294,11 +555,22 @@ MusicAlbum( title: "Kapitel 2.3 - 1984", duration: 144, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(24), ), TrackItem( @@ -306,11 +578,22 @@ MusicAlbum( title: "Kapitel 2.4 - 1984", duration: 136, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(25), ), TrackItem( @@ -318,11 +601,22 @@ MusicAlbum( title: "Kapitel 2.5 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(26), ), TrackItem( @@ -330,11 +624,22 @@ MusicAlbum( title: "Kapitel 2.6 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(27), ), TrackItem( @@ -342,11 +647,22 @@ MusicAlbum( title: "Kapitel 2.7 - 1984", duration: 153, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(28), ), TrackItem( @@ -354,11 +670,22 @@ MusicAlbum( title: "Kapitel 2.8 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(29), ), TrackItem( @@ -366,11 +693,22 @@ MusicAlbum( title: "Kapitel 2.9 - 1984", duration: 139, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(30), ), TrackItem( @@ -378,11 +716,22 @@ MusicAlbum( title: "Kapitel 2.10 - 1984", duration: 151, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(31), ), TrackItem( @@ -390,11 +739,22 @@ MusicAlbum( title: "Kapitel 2.11 & Kapitel 3.1 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(32), ), TrackItem( @@ -402,11 +762,22 @@ MusicAlbum( title: "Kapitel 3.2 - 1984", duration: 125, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(33), ), TrackItem( @@ -414,11 +785,22 @@ MusicAlbum( title: "Kapitel 3.3 - 1984", duration: 133, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(34), ), TrackItem( @@ -426,11 +808,22 @@ MusicAlbum( title: "Kapitel 3.4 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(35), ), TrackItem( @@ -438,11 +831,22 @@ MusicAlbum( title: "Kapitel 3.5 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(36), ), TrackItem( @@ -450,11 +854,22 @@ MusicAlbum( title: "Kapitel 3.6 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(37), ), TrackItem( @@ -462,11 +877,22 @@ MusicAlbum( title: "Kapitel 3.7 - 1984", duration: 141, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(38), ), TrackItem( @@ -474,11 +900,22 @@ MusicAlbum( title: "Kapitel 3.8 - 1984", duration: 188, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(39), ), TrackItem( @@ -486,11 +923,22 @@ MusicAlbum( title: "Kapitel 3.9 - 1984", duration: 135, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(40), ), TrackItem( @@ -498,11 +946,22 @@ MusicAlbum( title: "Kapitel 3.10 - 1984", duration: 133, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(41), ), TrackItem( @@ -510,11 +969,22 @@ MusicAlbum( title: "Kapitel 3.11 & Kapitel 4.1 - 1984", duration: 129, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(42), ), TrackItem( @@ -522,11 +992,22 @@ MusicAlbum( title: "Kapitel 4.2 - 1984", duration: 152, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(43), ), TrackItem( @@ -534,11 +1015,22 @@ MusicAlbum( title: "Kapitel 4.3 - 1984", duration: 136, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(44), ), TrackItem( @@ -546,11 +1038,22 @@ MusicAlbum( title: "Kapitel 4.4 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(45), ), TrackItem( @@ -558,11 +1061,22 @@ MusicAlbum( title: "Kapitel 4.5 - 1984", duration: 129, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(46), ), TrackItem( @@ -570,11 +1084,22 @@ MusicAlbum( title: "Kapitel 4.6 - 1984", duration: 134, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(47), ), TrackItem( @@ -582,11 +1107,22 @@ MusicAlbum( title: "Kapitel 4.7 - 1984", duration: 127, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(48), ), TrackItem( @@ -594,11 +1130,22 @@ MusicAlbum( title: "Kapitel 4.8 - 1984", duration: 137, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(49), ), TrackItem( @@ -606,11 +1153,22 @@ MusicAlbum( title: "Kapitel 4.9 - 1984", duration: 143, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(50), ), TrackItem( @@ -618,11 +1176,22 @@ MusicAlbum( title: "Kapitel 4.10 - 1984", duration: 144, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(51), ), TrackItem( @@ -630,11 +1199,22 @@ MusicAlbum( title: "Kapitel 4.11 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(52), ), TrackItem( @@ -642,11 +1222,22 @@ MusicAlbum( title: "Kapitel 4.12 - 1984", duration: 146, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(53), ), TrackItem( @@ -654,11 +1245,22 @@ MusicAlbum( title: "Kapitel 4.13 & Kapitel 5.1 - 1984", duration: 137, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(54), ), TrackItem( @@ -666,11 +1268,22 @@ MusicAlbum( title: "Kapitel 5.2 - 1984", duration: 142, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(55), ), TrackItem( @@ -678,11 +1291,22 @@ MusicAlbum( title: "Kapitel 5.3 - 1984", duration: 151, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(56), ), TrackItem( @@ -690,11 +1314,22 @@ MusicAlbum( title: "Kapitel 5.4 - 1984", duration: 161, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(57), ), TrackItem( @@ -702,11 +1337,22 @@ MusicAlbum( title: "Kapitel 5.5 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(58), ), TrackItem( @@ -714,11 +1360,22 @@ MusicAlbum( title: "Kapitel 5.6 - 1984", duration: 131, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(59), ), TrackItem( @@ -726,11 +1383,22 @@ MusicAlbum( title: "Kapitel 5.7 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(60), ), TrackItem( @@ -738,11 +1406,22 @@ MusicAlbum( title: "Kapitel 5.8 - 1984", duration: 154, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(61), ), TrackItem( @@ -750,11 +1429,22 @@ MusicAlbum( title: "Kapitel 5.9 - 1984", duration: 129, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(62), ), TrackItem( @@ -762,11 +1452,22 @@ MusicAlbum( title: "Kapitel 5.10 - 1984", duration: 148, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(63), ), TrackItem( @@ -774,11 +1475,22 @@ MusicAlbum( title: "Kapitel 5.11 - 1984", duration: 133, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(64), ), TrackItem( @@ -786,11 +1498,22 @@ MusicAlbum( title: "Kapitel 5.12 - 1984", duration: 129, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(65), ), TrackItem( @@ -798,11 +1521,22 @@ MusicAlbum( title: "Kapitel 5.13 - 1984", duration: 143, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(66), ), TrackItem( @@ -810,11 +1544,22 @@ MusicAlbum( title: "Kapitel 5.14 - 1984", duration: 152, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(67), ), TrackItem( @@ -822,11 +1567,22 @@ MusicAlbum( title: "Kapitel 5.15 - 1984", duration: 141, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(68), ), TrackItem( @@ -834,11 +1590,22 @@ MusicAlbum( title: "Kapitel 5.16 - 1984", duration: 133, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(69), ), TrackItem( @@ -846,11 +1613,22 @@ MusicAlbum( title: "Kapitel 5.17 & Kapitel 6.1 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(70), ), TrackItem( @@ -858,11 +1636,22 @@ MusicAlbum( title: "Kapitel 6.2 - 1984", duration: 129, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(71), ), TrackItem( @@ -870,11 +1659,22 @@ MusicAlbum( title: "Kapitel 6.3 - 1984", duration: 135, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(72), ), TrackItem( @@ -882,11 +1682,22 @@ MusicAlbum( title: "Kapitel 6.4 - 1984", duration: 135, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(73), ), TrackItem( @@ -894,11 +1705,22 @@ MusicAlbum( title: "Kapitel 6.5 - 1984", duration: 149, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(74), ), TrackItem( @@ -906,11 +1728,22 @@ MusicAlbum( title: "Kapitel 6.6 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(75), ), TrackItem( @@ -918,11 +1751,22 @@ MusicAlbum( title: "Kapitel 6.7 & Kapitel 7.1 - 1984", duration: 136, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(76), ), TrackItem( @@ -930,11 +1774,22 @@ MusicAlbum( title: "Kapitel 7.2 - 1984", duration: 153, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(77), ), TrackItem( @@ -942,11 +1797,22 @@ MusicAlbum( title: "Kapitel 7.3 - 1984", duration: 146, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(78), ), TrackItem( @@ -954,11 +1820,22 @@ MusicAlbum( title: "Kapitel 7.4 - 1984", duration: 144, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(79), ), TrackItem( @@ -966,11 +1843,22 @@ MusicAlbum( title: "Kapitel 7.5 - 1984", duration: 150, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(80), ), TrackItem( @@ -978,11 +1866,22 @@ MusicAlbum( title: "Kapitel 7.6 - 1984", duration: 139, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(81), ), TrackItem( @@ -990,11 +1889,22 @@ MusicAlbum( title: "Kapitel 7.7 - 1984", duration: 136, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(82), ), TrackItem( @@ -1002,11 +1912,22 @@ MusicAlbum( title: "Kapitel 7.8 - 1984", duration: 143, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(83), ), TrackItem( @@ -1014,11 +1935,22 @@ MusicAlbum( title: "Kapitel 7.9 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(84), ), TrackItem( @@ -1026,11 +1958,22 @@ MusicAlbum( title: "Kapitel 7.10 - 1984", duration: 126, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(85), ), TrackItem( @@ -1038,11 +1981,22 @@ MusicAlbum( title: "Kapitel 7.11 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(86), ), TrackItem( @@ -1050,11 +2004,22 @@ MusicAlbum( title: "Kapitel 7.12 - 1984", duration: 147, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(87), ), TrackItem( @@ -1062,11 +2027,22 @@ MusicAlbum( title: "Kapitel 7.13 - 1984", duration: 139, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(88), ), TrackItem( @@ -1074,11 +2050,22 @@ MusicAlbum( title: "Kapitel 7.15 & Kapitel 8.1 - 1984", duration: 138, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(90), ), TrackItem( @@ -1086,11 +2073,22 @@ MusicAlbum( title: "Kapitel 8.2 - 1984", duration: 138, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(91), ), TrackItem( @@ -1098,11 +2096,22 @@ MusicAlbum( title: "Kapitel 8.3 - 1984", duration: 167, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(92), ), TrackItem( @@ -1110,11 +2119,22 @@ MusicAlbum( title: "Kapitel 8.4 - 1984", duration: 131, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(93), ), TrackItem( @@ -1122,11 +2142,22 @@ MusicAlbum( title: "Kapitel 8.5 - 1984", duration: 155, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(94), ), TrackItem( @@ -1134,11 +2165,22 @@ MusicAlbum( title: "Kapitel 8.6 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(95), ), TrackItem( @@ -1146,11 +2188,22 @@ MusicAlbum( title: "Kapitel 8.7 - 1984", duration: 129, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(96), ), TrackItem( @@ -1158,11 +2211,22 @@ MusicAlbum( title: "Kapitel 8.8 - 1984", duration: 137, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(97), ), TrackItem( @@ -1170,11 +2234,22 @@ MusicAlbum( title: "Kapitel 8.9 - 1984", duration: 152, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(98), ), TrackItem( @@ -1182,11 +2257,22 @@ MusicAlbum( title: "Kapitel 8.10 - 1984", duration: 152, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(99), ), TrackItem( @@ -1194,11 +2280,22 @@ MusicAlbum( title: "Kapitel 8.11 - 1984", duration: 160, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(100), ), TrackItem( @@ -1206,11 +2303,22 @@ MusicAlbum( title: "Kapitel 8.12 - 1984", duration: 140, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(101), ), TrackItem( @@ -1218,11 +2326,22 @@ MusicAlbum( title: "Kapitel 8.13 - 1984", duration: 137, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(102), ), TrackItem( @@ -1230,11 +2349,22 @@ MusicAlbum( title: "Kapitel 8.14 - 1984", duration: 131, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(103), ), TrackItem( @@ -1242,11 +2372,22 @@ MusicAlbum( title: "Kapitel 8.15 - 1984", duration: 140, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(104), ), TrackItem( @@ -1254,11 +2395,22 @@ MusicAlbum( title: "Kapitel 8.16 - 1984", duration: 141, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(105), ), TrackItem( @@ -1266,11 +2418,22 @@ MusicAlbum( title: "Kapitel 8.17 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(106), ), TrackItem( @@ -1278,11 +2441,22 @@ MusicAlbum( title: "Kapitel 8.18 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(107), ), TrackItem( @@ -1290,11 +2464,22 @@ MusicAlbum( title: "Kapitel 8.19 - 1984", duration: 142, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(108), ), TrackItem( @@ -1302,11 +2487,22 @@ MusicAlbum( title: "Kapitel 8.20 - 1984", duration: 136, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(109), ), TrackItem( @@ -1314,11 +2510,22 @@ MusicAlbum( title: "Kapitel 8.21 - 1984", duration: 135, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(110), ), TrackItem( @@ -1326,11 +2533,22 @@ MusicAlbum( title: "Kapitel 8.22 - 1984", duration: 127, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(111), ), TrackItem( @@ -1338,11 +2556,22 @@ MusicAlbum( title: "Kapitel 8.23 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(112), ), TrackItem( @@ -1350,11 +2579,22 @@ MusicAlbum( title: "Kapitel 8.24 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(113), ), TrackItem( @@ -1362,11 +2602,22 @@ MusicAlbum( title: "Kapitel 8.25 - 1984", duration: 133, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(114), ), TrackItem( @@ -1374,11 +2625,22 @@ MusicAlbum( title: "Kapitel 8.26 & Kapitel 9.1 - 1984", duration: 137, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(115), ), TrackItem( @@ -1386,11 +2648,22 @@ MusicAlbum( title: "Kapitel 9.2 - 1984", duration: 154, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(116), ), TrackItem( @@ -1398,11 +2671,22 @@ MusicAlbum( title: "Kapitel 9.3 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(117), ), TrackItem( @@ -1410,11 +2694,22 @@ MusicAlbum( title: "Kapitel 9.4 - 1984", duration: 126, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(118), ), TrackItem( @@ -1422,11 +2717,22 @@ MusicAlbum( title: "Kapitel 9.5 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(119), ), TrackItem( @@ -1434,11 +2740,22 @@ MusicAlbum( title: "Kapitel 9.6 - 1984", duration: 136, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(120), ), TrackItem( @@ -1446,11 +2763,22 @@ MusicAlbum( title: "Kapitel 9.7 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(121), ), TrackItem( @@ -1458,11 +2786,22 @@ MusicAlbum( title: "Kapitel 9.8 - 1984", duration: 142, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(122), ), TrackItem( @@ -1470,11 +2809,22 @@ MusicAlbum( title: "Kapitel 9.9 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(123), ), TrackItem( @@ -1482,11 +2832,22 @@ MusicAlbum( title: "Kapitel 9.10 - 1984", duration: 131, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(124), ), TrackItem( @@ -1494,11 +2855,22 @@ MusicAlbum( title: "Kapitel 9.11 - 1984", duration: 138, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(125), ), TrackItem( @@ -1506,11 +2878,22 @@ MusicAlbum( title: "Kapitel 9.12 - 1984", duration: 151, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(126), ), TrackItem( @@ -1518,11 +2901,22 @@ MusicAlbum( title: "Kapitel 9.13 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(127), ), TrackItem( @@ -1530,11 +2924,22 @@ MusicAlbum( title: "Kapitel 9.14 & Kapitel 10.1 - 1984", duration: 151, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(128), ), TrackItem( @@ -1542,11 +2947,22 @@ MusicAlbum( title: "Kapitel 10.2 - 1984", duration: 134, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(129), ), TrackItem( @@ -1554,11 +2970,22 @@ MusicAlbum( title: "Kapitel 10.3 - 1984", duration: 127, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(130), ), TrackItem( @@ -1566,11 +2993,22 @@ MusicAlbum( title: "Kapitel 10.4 - 1984", duration: 138, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(131), ), TrackItem( @@ -1578,11 +3016,22 @@ MusicAlbum( title: "Kapitel 10.5 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(132), ), TrackItem( @@ -1590,11 +3039,22 @@ MusicAlbum( title: "Kapitel 10.6 - 1984", duration: 140, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(133), ), TrackItem( @@ -1602,11 +3062,22 @@ MusicAlbum( title: "Kapitel 10.7 - 1984", duration: 135, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(134), ), TrackItem( @@ -1614,11 +3085,22 @@ MusicAlbum( title: "Kapitel 10.8 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(135), ), TrackItem( @@ -1626,11 +3108,22 @@ MusicAlbum( title: "Kapitel 10.9 - 1984", duration: 136, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(136), ), TrackItem( @@ -1638,11 +3131,22 @@ MusicAlbum( title: "Kapitel 10.10 - 1984", duration: 131, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(137), ), TrackItem( @@ -1650,11 +3154,22 @@ MusicAlbum( title: "Kapitel 10.11 - 1984", duration: 142, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(138), ), TrackItem( @@ -1662,11 +3177,22 @@ MusicAlbum( title: "Kapitel 10.12 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(139), ), TrackItem( @@ -1674,11 +3200,22 @@ MusicAlbum( title: "Kapitel 10.13 & Kapitel 11.1 - 1984", duration: 126, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(140), ), TrackItem( @@ -1686,11 +3223,22 @@ MusicAlbum( title: "Kapitel 11.2 - 1984", duration: 136, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(141), ), TrackItem( @@ -1698,11 +3246,22 @@ MusicAlbum( title: "Kapitel 11.3 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(142), ), TrackItem( @@ -1710,11 +3269,22 @@ MusicAlbum( title: "Kapitel 11.4 - 1984", duration: 149, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(143), ), TrackItem( @@ -1722,11 +3292,22 @@ MusicAlbum( title: "Kapitel 11.5 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(144), ), TrackItem( @@ -1734,11 +3315,22 @@ MusicAlbum( title: "Kapitel 11.6 - 1984", duration: 125, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(145), ), TrackItem( @@ -1746,11 +3338,22 @@ MusicAlbum( title: "Kapitel 11.7 - 1984", duration: 140, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(146), ), TrackItem( @@ -1758,11 +3361,22 @@ MusicAlbum( title: "Kapitel 11.8 - 1984", duration: 126, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(147), ), TrackItem( @@ -1770,11 +3384,22 @@ MusicAlbum( title: "Kapitel 11.9 - 1984", duration: 137, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(148), ), TrackItem( @@ -1782,11 +3407,22 @@ MusicAlbum( title: "Kapitel 11.10 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(149), ), TrackItem( @@ -1794,11 +3430,22 @@ MusicAlbum( title: "Kapitel 11.11 - 1984", duration: 148, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(150), ), TrackItem( @@ -1806,11 +3453,22 @@ MusicAlbum( title: "Kapitel 11.12 & Kapitel 12.1 - 1984", duration: 126, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(151), ), TrackItem( @@ -1818,11 +3476,22 @@ MusicAlbum( title: "Kapitel 12.2 - 1984", duration: 134, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(152), ), TrackItem( @@ -1830,11 +3499,22 @@ MusicAlbum( title: "Kapitel 12.3 - 1984", duration: 133, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(153), ), TrackItem( @@ -1842,11 +3522,22 @@ MusicAlbum( title: "Kapitel 12.4 - 1984", duration: 134, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(154), ), TrackItem( @@ -1854,11 +3545,22 @@ MusicAlbum( title: "Kapitel 12.5 - 1984", duration: 133, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(155), ), TrackItem( @@ -1866,11 +3568,22 @@ MusicAlbum( title: "Kapitel 12.6 - 1984", duration: 161, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(156), ), TrackItem( @@ -1878,11 +3591,22 @@ MusicAlbum( title: "Kapitel 12.7 - 1984", duration: 127, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(157), ), TrackItem( @@ -1890,11 +3614,22 @@ MusicAlbum( title: "Kapitel 12.8 - 1984", duration: 131, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(158), ), TrackItem( @@ -1902,11 +3637,22 @@ MusicAlbum( title: "Kapitel 12.9 - 1984", duration: 136, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(159), ), TrackItem( @@ -1914,11 +3660,22 @@ MusicAlbum( title: "Kapitel 12.10 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(160), ), TrackItem( @@ -1926,11 +3683,22 @@ MusicAlbum( title: "Kapitel 12.11 - 1984", duration: 139, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(161), ), TrackItem( @@ -1938,11 +3706,22 @@ MusicAlbum( title: "Kapitel 12.12 & Kapitel 13.1 - 1984", duration: 133, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(162), ), TrackItem( @@ -1950,11 +3729,22 @@ MusicAlbum( title: "Kapitel 13.2 - 1984", duration: 147, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(163), ), TrackItem( @@ -1962,11 +3752,22 @@ MusicAlbum( title: "Kapitel 13.3 - 1984", duration: 161, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(164), ), TrackItem( @@ -1974,11 +3775,22 @@ MusicAlbum( title: "Kapitel 13.4 - 1984", duration: 147, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(165), ), TrackItem( @@ -1986,11 +3798,22 @@ MusicAlbum( title: "Kapitel 13.5 - 1984", duration: 149, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(166), ), TrackItem( @@ -1998,11 +3821,22 @@ MusicAlbum( title: "Kapitel 13.6 - 1984", duration: 139, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(167), ), TrackItem( @@ -2010,11 +3844,22 @@ MusicAlbum( title: "Kapitel 13.7 - 1984", duration: 161, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(168), ), TrackItem( @@ -2022,11 +3867,22 @@ MusicAlbum( title: "Kapitel 13.8 - 1984", duration: 142, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(169), ), TrackItem( @@ -2034,11 +3890,22 @@ MusicAlbum( title: "Kapitel 13.9 - 1984", duration: 126, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(170), ), TrackItem( @@ -2046,11 +3913,22 @@ MusicAlbum( title: "Kapitel 13.10 - 1984", duration: 135, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(171), ), TrackItem( @@ -2058,11 +3936,22 @@ MusicAlbum( title: "Kapitel 13.11 & Kapitel 14.1 - 1984", duration: 135, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(172), ), TrackItem( @@ -2070,11 +3959,22 @@ MusicAlbum( title: "Kapitel 14.2 - 1984", duration: 129, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(173), ), TrackItem( @@ -2082,11 +3982,22 @@ MusicAlbum( title: "Kapitel 14.3 - 1984", duration: 126, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(174), ), TrackItem( @@ -2094,11 +4005,22 @@ MusicAlbum( title: "Kapitel 14.4 & Kapitel 15.1 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(175), ), TrackItem( @@ -2106,11 +4028,22 @@ MusicAlbum( title: "Kapitel 15.2 - 1984", duration: 161, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(176), ), TrackItem( @@ -2118,11 +4051,22 @@ MusicAlbum( title: "Kapitel 15.3 - 1984", duration: 154, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(177), ), TrackItem( @@ -2130,11 +4074,22 @@ MusicAlbum( title: "Kapitel 15.4 - 1984", duration: 134, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(178), ), TrackItem( @@ -2142,11 +4097,22 @@ MusicAlbum( title: "Kapitel 15.5 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(179), ), TrackItem( @@ -2154,11 +4120,22 @@ MusicAlbum( title: "Kapitel 15.6 - 1984", duration: 134, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(180), ), TrackItem( @@ -2166,11 +4143,22 @@ MusicAlbum( title: "Kapitel 15.7 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(181), ), TrackItem( @@ -2178,11 +4166,22 @@ MusicAlbum( title: "Kapitel 15.8 - 1984", duration: 126, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(182), ), TrackItem( @@ -2190,11 +4189,22 @@ MusicAlbum( title: "Kapitel 15.9 - 1984", duration: 130, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(183), ), TrackItem( @@ -2202,11 +4212,22 @@ MusicAlbum( title: "Kapitel 15.10 & Kapitel 16.1 - 1984", duration: 145, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(184), ), TrackItem( @@ -2214,11 +4235,22 @@ MusicAlbum( title: "Kapitel 16.2 - 1984", duration: 136, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(185), ), TrackItem( @@ -2226,11 +4258,22 @@ MusicAlbum( title: "Kapitel 16.3 - 1984", duration: 143, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(186), ), TrackItem( @@ -2238,11 +4281,22 @@ MusicAlbum( title: "Kapitel 16.4 - 1984", duration: 138, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(187), ), TrackItem( @@ -2250,11 +4304,22 @@ MusicAlbum( title: "Kapitel 16.5 - 1984", duration: 143, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(188), ), TrackItem( @@ -2262,11 +4327,22 @@ MusicAlbum( title: "Kapitel 16.6 - 1984", duration: 135, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(189), ), TrackItem( @@ -2274,11 +4350,22 @@ MusicAlbum( title: "Kapitel 16.7 - 1984", duration: 127, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(190), ), TrackItem( @@ -2286,11 +4373,22 @@ MusicAlbum( title: "Kapitel 16.8 - 1984", duration: 144, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(191), ), TrackItem( @@ -2298,11 +4396,22 @@ MusicAlbum( title: "Kapitel 16.9 - 1984", duration: 134, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(192), ), TrackItem( @@ -2310,11 +4419,22 @@ MusicAlbum( title: "Kapitel 16.10 - 1984", duration: 126, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(193), ), TrackItem( @@ -2322,11 +4442,22 @@ MusicAlbum( title: "Kapitel 16.11 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(194), ), TrackItem( @@ -2334,11 +4465,22 @@ MusicAlbum( title: "Kapitel 16.12 - 1984", duration: 129, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(195), ), TrackItem( @@ -2346,11 +4488,22 @@ MusicAlbum( title: "Kapitel 16.13 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(196), ), TrackItem( @@ -2358,11 +4511,22 @@ MusicAlbum( title: "Kapitel 16.14 & Kapitel 17.1 - 1984", duration: 193, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(197), ), TrackItem( @@ -2370,11 +4534,22 @@ MusicAlbum( title: "Kapitel 17.2 - 1984", duration: 129, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(198), ), TrackItem( @@ -2382,11 +4557,22 @@ MusicAlbum( title: "Kapitel 17.3 - 1984", duration: 157, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(199), ), TrackItem( @@ -2394,11 +4580,22 @@ MusicAlbum( title: "Kapitel 17.4 - 1984", duration: 132, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(200), ), TrackItem( @@ -2406,11 +4603,22 @@ MusicAlbum( title: "Kapitel 17.5 - 1984", duration: 128, cover: [], - artists: [], - artists_txt: Some("George Orwell & Dirk Jacobs"), - album: None, + artists: [ + ArtistId( + id: None, + name: "George Orwell", + ), + ArtistId( + id: None, + name: "Dirk Jacobs", + ), + ], + album: Some(AlbumId( + id: "MPREb_gaoNzsQHedo", + name: "1984", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(201), ), ], diff --git a/tests/snapshots/youtube__music_album_ep.snap b/tests/snapshots/youtube__music_album_ep.snap index 2bb50ec..eed9215 100644 --- a/tests/snapshots/youtube__music_album_ep.snap +++ b/tests/snapshots/youtube__music_album_ep.snap @@ -8,12 +8,11 @@ MusicAlbum( name: "Waldbrand", cover: "[cover]", artists: [ - ChannelId( - id: "UCpJyCbFbdTrx0M90HCNBHFQ", + ArtistId( + id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"), name: "Madeline Juno", ), ], - artists_txt: "Madeline Juno", album_type: Ep, year: Some(2016), by_va: false, @@ -24,15 +23,17 @@ MusicAlbum( duration: 221, cover: [], artists: [ - ChannelId( - id: "UCpJyCbFbdTrx0M90HCNBHFQ", + ArtistId( + id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"), name: "Madeline Juno", ), ], - artists_txt: Some("Madeline Juno"), - album: None, + album: Some(AlbumId( + id: "MPREb_u1I69lSAe5v", + name: "Waldbrand", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(1), ), TrackItem( @@ -41,15 +42,17 @@ MusicAlbum( duration: 208, cover: [], artists: [ - ChannelId( - id: "UCpJyCbFbdTrx0M90HCNBHFQ", + ArtistId( + id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"), name: "Madeline Juno", ), ], - artists_txt: Some("Madeline Juno"), - album: None, + album: Some(AlbumId( + id: "MPREb_u1I69lSAe5v", + name: "Waldbrand", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(2), ), TrackItem( @@ -58,15 +61,17 @@ MusicAlbum( duration: 223, cover: [], artists: [ - ChannelId( - id: "UCpJyCbFbdTrx0M90HCNBHFQ", + ArtistId( + id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"), name: "Madeline Juno", ), ], - artists_txt: Some("Madeline Juno"), - album: None, + album: Some(AlbumId( + id: "MPREb_u1I69lSAe5v", + name: "Waldbrand", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(3), ), TrackItem( @@ -75,15 +80,17 @@ MusicAlbum( duration: 221, cover: [], artists: [ - ChannelId( - id: "UCpJyCbFbdTrx0M90HCNBHFQ", + ArtistId( + id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"), name: "Madeline Juno", ), ], - artists_txt: Some("Madeline Juno"), - album: None, + album: Some(AlbumId( + id: "MPREb_u1I69lSAe5v", + name: "Waldbrand", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(4), ), TrackItem( @@ -92,15 +99,17 @@ MusicAlbum( duration: 197, cover: [], artists: [ - ChannelId( - id: "UCpJyCbFbdTrx0M90HCNBHFQ", + ArtistId( + id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"), name: "Madeline Juno", ), ], - artists_txt: Some("Madeline Juno"), - album: None, + album: Some(AlbumId( + id: "MPREb_u1I69lSAe5v", + name: "Waldbrand", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(5), ), ], diff --git a/tests/snapshots/youtube__music_album_one_artist.snap b/tests/snapshots/youtube__music_album_one_artist.snap index 3bd35ea..d94b700 100644 --- a/tests/snapshots/youtube__music_album_one_artist.snap +++ b/tests/snapshots/youtube__music_album_one_artist.snap @@ -8,12 +8,11 @@ MusicAlbum( name: "Märchen enden gut", cover: "[cover]", artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: "Oonagh", album_type: Album, year: Some(2016), by_va: false, @@ -24,15 +23,17 @@ MusicAlbum( duration: 216, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(1), ), TrackItem( @@ -41,15 +42,17 @@ MusicAlbum( duration: 224, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(2), ), TrackItem( @@ -58,15 +61,17 @@ MusicAlbum( duration: 176, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(3), ), TrackItem( @@ -75,15 +80,17 @@ MusicAlbum( duration: 215, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(4), ), TrackItem( @@ -92,15 +99,17 @@ MusicAlbum( duration: 268, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(5), ), TrackItem( @@ -109,15 +118,17 @@ MusicAlbum( duration: 202, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(6), ), TrackItem( @@ -126,15 +137,17 @@ MusicAlbum( duration: 185, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(7), ), TrackItem( @@ -143,15 +156,17 @@ MusicAlbum( duration: 226, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(8), ), TrackItem( @@ -160,15 +175,17 @@ MusicAlbum( duration: 207, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(9), ), TrackItem( @@ -177,15 +194,17 @@ MusicAlbum( duration: 211, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(10), ), TrackItem( @@ -194,15 +213,17 @@ MusicAlbum( duration: 179, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(11), ), TrackItem( @@ -211,15 +232,17 @@ MusicAlbum( duration: 218, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(12), ), TrackItem( @@ -228,15 +251,17 @@ MusicAlbum( duration: 277, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(13), ), TrackItem( @@ -245,15 +270,17 @@ MusicAlbum( duration: 204, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(14), ), TrackItem( @@ -262,15 +289,17 @@ MusicAlbum( duration: 202, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(15), ), TrackItem( @@ -279,15 +308,17 @@ MusicAlbum( duration: 222, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(16), ), TrackItem( @@ -296,15 +327,17 @@ MusicAlbum( duration: 177, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(17), ), TrackItem( @@ -313,15 +346,17 @@ MusicAlbum( duration: 220, cover: [], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: Some("Oonagh"), - album: None, + album: Some(AlbumId( + id: "MPREb_nlBWQROfvjo", + name: "Märchen enden gut", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(18), ), ], @@ -342,14 +377,14 @@ MusicAlbum( ), ], artists: [ - ChannelId( - id: "UC_vmjW5e1xEHhYjY2a0kK1A", + ArtistId( + id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"), name: "Oonagh", ), ], - artists_txt: "Oonagh", album_type: Album, year: None, + by_va: false, ), ], ) diff --git a/tests/snapshots/youtube__music_album_show.snap b/tests/snapshots/youtube__music_album_show.snap index ac8d8d9..29e40f8 100644 --- a/tests/snapshots/youtube__music_album_show.snap +++ b/tests/snapshots/youtube__music_album_show.snap @@ -8,12 +8,11 @@ MusicAlbum( name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", cover: "[cover]", artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: "Kingdom Force", album_type: Show, year: Some(2022), by_va: false, @@ -24,15 +23,17 @@ MusicAlbum( duration: 229, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(1), ), TrackItem( @@ -41,15 +42,17 @@ MusicAlbum( duration: 235, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(2), ), TrackItem( @@ -58,15 +61,17 @@ MusicAlbum( duration: 197, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(3), ), TrackItem( @@ -75,15 +80,17 @@ MusicAlbum( duration: 186, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(4), ), TrackItem( @@ -92,15 +99,17 @@ MusicAlbum( duration: 188, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(5), ), TrackItem( @@ -109,15 +118,17 @@ MusicAlbum( duration: 205, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(6), ), TrackItem( @@ -126,15 +137,17 @@ MusicAlbum( duration: 219, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(7), ), TrackItem( @@ -143,15 +156,17 @@ MusicAlbum( duration: 240, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(8), ), TrackItem( @@ -160,15 +175,17 @@ MusicAlbum( duration: 239, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(9), ), TrackItem( @@ -177,15 +194,17 @@ MusicAlbum( duration: 197, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(10), ), TrackItem( @@ -194,15 +213,17 @@ MusicAlbum( duration: 201, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(11), ), TrackItem( @@ -211,15 +232,17 @@ MusicAlbum( duration: 187, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(12), ), TrackItem( @@ -228,15 +251,17 @@ MusicAlbum( duration: 183, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(13), ), TrackItem( @@ -245,15 +270,17 @@ MusicAlbum( duration: 193, cover: [], artists: [ - ChannelId( - id: "UCNoyEM0e2A7WlsBmP2w3avg", + ArtistId( + id: Some("UCNoyEM0e2A7WlsBmP2w3avg"), name: "Kingdom Force", ), ], - artists_txt: Some("Kingdom Force"), - album: None, + album: Some(AlbumId( + id: "MPREb_cwzk8EUwypZ", + name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(14), ), ], diff --git a/tests/snapshots/youtube__music_album_single.snap b/tests/snapshots/youtube__music_album_single.snap index fb88438..1ad37d7 100644 --- a/tests/snapshots/youtube__music_album_single.snap +++ b/tests/snapshots/youtube__music_album_single.snap @@ -8,16 +8,15 @@ MusicAlbum( name: "Der Himmel reißt auf", cover: "[cover]", artists: [ - ChannelId( - id: "UCXGYZ-OhdOpPBamHX3K9YRg", + ArtistId( + id: Some("UCXGYZ-OhdOpPBamHX3K9YRg"), name: "Joel Brandenstein", ), - ChannelId( - id: "UCFTcSVPYRWlDoHisR-ZKwgw", + ArtistId( + id: Some("UCFTcSVPYRWlDoHisR-ZKwgw"), name: "Vanessa Mai", ), ], - artists_txt: "Joel Brandenstein & Vanessa Mai", album_type: Single, year: Some(2020), by_va: false, @@ -28,19 +27,21 @@ MusicAlbum( duration: 183, cover: [], artists: [ - ChannelId( - id: "UCXGYZ-OhdOpPBamHX3K9YRg", + ArtistId( + id: Some("UCXGYZ-OhdOpPBamHX3K9YRg"), name: "Joel Brandenstein", ), - ChannelId( - id: "UCFTcSVPYRWlDoHisR-ZKwgw", + ArtistId( + id: Some("UCFTcSVPYRWlDoHisR-ZKwgw"), name: "Vanessa Mai", ), ], - artists_txt: Some("Joel Brandenstein & Vanessa Mai"), - album: None, + album: Some(AlbumId( + id: "MPREb_bHfHGoy7vuv", + name: "Der Himmel reißt auf", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(1), ), ], diff --git a/tests/snapshots/youtube__music_album_various_artists.snap b/tests/snapshots/youtube__music_album_various_artists.snap index 26d7572..b3b66ca 100644 --- a/tests/snapshots/youtube__music_album_various_artists.snap +++ b/tests/snapshots/youtube__music_album_various_artists.snap @@ -8,7 +8,6 @@ MusicAlbum( name: "＜Queendom2＞ FINAL", cover: "[cover]", artists: [], - artists_txt: "Various Artists", album_type: Single, year: Some(2022), by_va: true, @@ -18,11 +17,18 @@ MusicAlbum( title: "Waka Boom (My Way) (feat. Lee Young Ji)", duration: 274, cover: [], - artists: [], - artists_txt: Some("HYOLYN"), - album: None, + artists: [ + ArtistId( + id: None, + name: "HYOLYN", + ), + ], + album: Some(AlbumId( + id: "MPREb_8QkDeEIawvX", + name: "＜Queendom2＞ FINAL", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(1), ), TrackItem( @@ -30,11 +36,18 @@ MusicAlbum( title: "AURA", duration: 216, cover: [], - artists: [], - artists_txt: Some("WJSN"), - album: None, + artists: [ + ArtistId( + id: None, + name: "WJSN", + ), + ], + album: Some(AlbumId( + id: "MPREb_8QkDeEIawvX", + name: "＜Queendom2＞ FINAL", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(2), ), TrackItem( @@ -43,15 +56,17 @@ MusicAlbum( duration: 239, cover: [], artists: [ - ChannelId( - id: "UCAKvDuIX3m1AUdPpDSqV_3w", + ArtistId( + id: Some("UCAKvDuIX3m1AUdPpDSqV_3w"), name: "Kep1er", ), ], - artists_txt: Some("Kep1er"), - album: None, + album: Some(AlbumId( + id: "MPREb_8QkDeEIawvX", + name: "＜Queendom2＞ FINAL", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(3), ), TrackItem( @@ -59,11 +74,18 @@ MusicAlbum( title: "Red Sun!", duration: 254, cover: [], - artists: [], - artists_txt: Some("VIVIZ"), - album: None, + artists: [ + ArtistId( + id: None, + name: "VIVIZ", + ), + ], + album: Some(AlbumId( + id: "MPREb_8QkDeEIawvX", + name: "＜Queendom2＞ FINAL", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(4), ), TrackItem( @@ -71,11 +93,18 @@ MusicAlbum( title: "POSE", duration: 187, cover: [], - artists: [], - artists_txt: Some("LOONA"), - album: None, + artists: [ + ArtistId( + id: None, + name: "LOONA", + ), + ], + album: Some(AlbumId( + id: "MPREb_8QkDeEIawvX", + name: "＜Queendom2＞ FINAL", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(5), ), TrackItem( @@ -83,11 +112,18 @@ MusicAlbum( title: "Whistle", duration: 224, cover: [], - artists: [], - artists_txt: Some("Brave Girls"), - album: None, + artists: [ + ArtistId( + id: None, + name: "Brave Girls", + ), + ], + album: Some(AlbumId( + id: "MPREb_8QkDeEIawvX", + name: "＜Queendom2＞ FINAL", + )), view_count: None, - is_video: true, + is_video: false, track_nr: Some(6), ), ], diff --git a/tests/youtube.rs b/tests/youtube.rs index e132a14..cdaf0ac 100644 --- a/tests/youtube.rs +++ b/tests/youtube.rs @@ -1386,10 +1386,13 @@ async fn music_search(#[case] typo: bool) { assert_eq!(track.duration, 230); assert!(!track.cover.is_empty(), "got no cover"); + assert_eq!(track.artists.len(), 1); let track_artist = &track.artists[0]; - assert_eq!(track_artist.id, "UCEdZAdnnKqbaHOlv8nM6OtA"); + assert_eq!( + track_artist.id.as_ref().unwrap(), + "UCEdZAdnnKqbaHOlv8nM6OtA" + ); assert_eq!(track_artist.name, "aespa"); - assert_eq!(track.artists_txt.as_ref().unwrap(), "aespa"); assert_eq!(track.album, None); assert_gte(track.view_count.unwrap(), 230_000_000, "views"); assert!(track.is_video, "got no video"); @@ -1414,10 +1417,13 @@ async fn music_search_tracks(#[case] videos: bool) { assert_eq!(track.is_video, videos); assert_eq!(track.track_nr, None); + assert_eq!(track.artists.len(), 1); let track_artist = &track.artists[0]; - assert_eq!(track_artist.id, "UCEdZAdnnKqbaHOlv8nM6OtA"); + assert_eq!( + track_artist.id.as_ref().unwrap(), + "UCEdZAdnnKqbaHOlv8nM6OtA" + ); assert_eq!(track_artist.name, "aespa"); - assert_eq!(track.artists_txt.as_ref().unwrap(), "aespa"); if videos { assert_eq!(track.id, "ZeerrnuLi5E"); @@ -1484,10 +1490,10 @@ async fn music_search_albums( let album = &res.items.items[0]; assert_eq!(album.name, name); assert_eq!(album.id, id); - assert_eq!(album.artists_txt, artist); + assert_eq!(album.artists.len(), 1); let album_artist = &album.artists[0]; - assert_eq!(album_artist.id, artist_id); + assert_eq!(album_artist.id.as_ref().unwrap(), artist_id); assert_eq!(album_artist.name, artist); assert!(!album.cover.is_empty(), "got no cover");