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