diff --git a/README.md b/README.md index d1e2eee..d0b5eca 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ inspired by [NewPipe](https://github.com/TeamNewPipe/NewPipeExtractor). ### YouTube Music - [X] **Playlist** -- [X] **Album** +- [ ] **Album** - [ ] **Artist** -- [X] **Search** +- [ ] **Search** - [ ] **Search suggestions** - [ ] **Moods** - [ ] **Charts** diff --git a/src/client/pagination.rs b/src/client/pagination.rs index b85df14..4732079 100644 --- a/src/client/pagination.rs +++ b/src/client/pagination.rs @@ -35,7 +35,7 @@ impl RustyPipeQuery { ) .await?; - Ok(map_ytm_paginator(p, visitor_data, endpoint)) + Ok(map_ytm_paginator(p, endpoint)) } else { let context = self .get_context(ClientType::Desktop, true, visitor_data) @@ -55,35 +55,33 @@ impl RustyPipeQuery { ) .await?; - Ok(map_yt_paginator(p, visitor_data, endpoint)) + Ok(map_yt_paginator(p, endpoint)) } } } fn map_yt_paginator( p: Paginator, - visitor_data: Option<&str>, endpoint: ContinuationEndpoint, ) -> Paginator { Paginator { count: p.count, items: p.items.into_iter().filter_map(T::from_yt_item).collect(), ctoken: p.ctoken, - visitor_data: visitor_data.map(str::to_owned), + visitor_data: p.visitor_data, endpoint, } } fn map_ytm_paginator( p: Paginator, - visitor_data: Option<&str>, endpoint: ContinuationEndpoint, ) -> Paginator { Paginator { count: p.count, items: p.items.into_iter().filter_map(T::from_ytm_item).collect(), ctoken: p.ctoken, - visitor_data: visitor_data.map(str::to_owned), + visitor_data: p.visitor_data, endpoint, } } @@ -320,7 +318,7 @@ mod tests { let map_res: MapResult> = items.map_response("", Language::En, None).unwrap(); let paginator: Paginator = - map_yt_paginator(map_res.c, None, ContinuationEndpoint::Browse); + map_yt_paginator(map_res.c, ContinuationEndpoint::Browse); assert!( map_res.warnings.is_empty(), @@ -342,7 +340,7 @@ mod tests { let map_res: MapResult> = items.map_response("", Language::En, None).unwrap(); let paginator: Paginator = - map_ytm_paginator(map_res.c, None, ContinuationEndpoint::MusicBrowse); + map_ytm_paginator(map_res.c, ContinuationEndpoint::MusicBrowse); assert!( map_res.warnings.is_empty(), diff --git a/src/client/response/music_item.rs b/src/client/response/music_item.rs index 4561ce9..a63d929 100644 --- a/src/client/response/music_item.rs +++ b/src/client/response/music_item.rs @@ -83,8 +83,6 @@ pub(crate) struct ListMusicItem { pub navigation_endpoint: Option, #[serde(default)] pub flex_column_display_style: FlexColumnDisplayStyle, - #[serde_as(as = "Option")] - pub index: Option, } #[derive(Default, Debug, Deserialize)] @@ -264,7 +262,7 @@ impl MusicListMapper { match page_type { PageType::Artist => { let subscriber_count = subtitle_p2.and_then(|p| { - util::parse_large_numstr(p.first_str(), self.lang) + util::parse_large_numstr(&p.to_string(), self.lang) }); self.items.push(MusicItem::Artist(ArtistItem { @@ -277,13 +275,13 @@ impl MusicListMapper { } PageType::Album => { let album_type = subtitle_p1 - .map(|st| map_album_type(st.first_str())) + .map(|st| map_album_type(&st.to_string())) .unwrap_or_default(); let (artists, artists_txt) = map_artists(subtitle_p2); let year = subtitle_p3 - .and_then(|st| util::parse_numeric(st.first_str()).ok()); + .and_then(|st| util::parse_numeric(&st.to_string()).ok()); self.items.push(MusicItem::Album(AlbumItem { id, @@ -305,13 +303,15 @@ impl MusicListMapper { let from_ytm = channel_p .as_ref() - .map(|p| p.first_str() == util::YT_MUSIC_NAME) + .and_then(|p| { + p.0.first().map(|txt| txt.as_str() == util::YT_MUSIC_NAME) + }) .unwrap_or_default(); let channel = channel_p.and_then(|p| { p.0.into_iter().find_map(|c| ChannelId::try_from(c).ok()) }); let track_count = - tcount_p.and_then(|p| util::parse_numeric(p.first_str()).ok()); + tcount_p.and_then(|p| util::parse_numeric(&p.to_string()).ok()); self.items.push(MusicItem::Playlist(MusicPlaylistItem { id, @@ -381,7 +381,7 @@ impl MusicListMapper { }; let duration = duration_p - .and_then(|p| util::parse_video_length(p.first_str())) + .and_then(|p| util::parse_video_length(&p.to_string())) .ok_or_else(|| format!("track {}: could not parse duration", id))?; // The album field contains the track count for search videos @@ -389,7 +389,7 @@ impl MusicListMapper { (FlexColumnDisplayStyle::TwoLines, true) => ( None, album_p.and_then(|p| { - util::parse_large_numstr(p.first_str(), self.lang) + util::parse_large_numstr(&p.to_string(), self.lang) }), ), (_, false) => ( @@ -419,8 +419,6 @@ impl MusicListMapper { } } - let track_nr = item.index.and_then(|txt| util::parse_numeric(&txt).ok()); - self.items.push(MusicItem::Track(TrackItem { id, title, @@ -431,7 +429,6 @@ impl MusicListMapper { album, view_count, is_video, - track_nr, })); Ok(MusicEntityType::Track) } @@ -457,7 +454,7 @@ impl MusicListMapper { match (subtitle_p1, subtitle_p2, &self.o_artists, self.artist_page) { // "2022" (Artist singles) (Some(year_txt), None, Some((artists, artists_txt)), true) => { - year = util::parse_numeric(year_txt.first_str()).ok(); + year = util::parse_numeric(&year_txt.to_string()).ok(); (artists.clone(), artists_txt.clone()) } // "Album", "2022" (Artist albums) @@ -467,13 +464,13 @@ impl MusicListMapper { Some((artists, artists_txt)), true, ) => { - year = util::parse_numeric(year_txt.first_str()).ok(); - album_type = map_album_type(atype_txt.first_str()); + year = util::parse_numeric(&year_txt.to_string()).ok(); + album_type = map_album_type(&atype_txt.to_string()); (artists.clone(), artists_txt.clone()) } // "Album", <"Oonagh"> (Album variants, new releases) (Some(atype_txt), Some(p2), _, false) => { - album_type = map_album_type(atype_txt.first_str()); + album_type = map_album_type(&atype_txt.to_string()); map_artists(Some(p2)) } _ => { @@ -496,15 +493,18 @@ impl MusicListMapper { Ok(MusicEntityType::Album) } PageType::Playlist => { + // TODO: make component to string zero-copy if len=1 let from_ytm = subtitle_p2 .as_ref() - .map(|p| p.first_str() == util::YT_MUSIC_NAME) + .and_then(|p| { + p.0.first().map(|txt| txt.as_str() == util::YT_MUSIC_NAME) + }) .unwrap_or_default(); let channel = subtitle_p2.and_then(|p| { p.0.into_iter().find_map(|c| ChannelId::try_from(c).ok()) }); let track_count = - subtitle_p3.and_then(|p| util::parse_numeric(p.first_str()).ok()); + subtitle_p3.and_then(|p| util::parse_numeric(&p.to_string()).ok()); self.items.push(MusicItem::Playlist(MusicPlaylistItem { id, @@ -518,7 +518,7 @@ impl MusicListMapper { } PageType::Artist => { let subscriber_count = subtitle_p1 - .and_then(|p| util::parse_large_numstr(p.first_str(), self.lang)); + .and_then(|p| util::parse_large_numstr(&p.to_string(), self.lang)); self.items.push(MusicItem::Artist(ArtistItem { id, diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_one_artist.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_one_artist.snap index a886186..1266f51 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 @@ -54,7 +54,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(1), ), TrackItem( id: "rREEBXp0y9s", @@ -71,7 +70,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(2), ), TrackItem( id: "zvU5Y8Q19hU", @@ -88,7 +86,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(3), ), TrackItem( id: "ARKLrzzTQA0", @@ -105,7 +102,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(4), ), TrackItem( id: "tstLgN8A_Ng", @@ -122,7 +118,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(5), ), TrackItem( id: "k2DjgQOY3Ts", @@ -139,7 +134,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(6), ), TrackItem( id: "azHwhecxEsI", @@ -156,7 +150,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(7), ), TrackItem( id: "_FcsdYIQ2co", @@ -173,7 +166,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(8), ), TrackItem( id: "27bOWEbshyE", @@ -190,7 +182,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(9), ), TrackItem( id: "riD_3oZwt8w", @@ -207,7 +198,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(10), ), TrackItem( id: "8GNvjF3no9s", @@ -224,7 +214,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(11), ), TrackItem( id: "YHMFzf1uN2U", @@ -241,7 +230,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(12), ), TrackItem( id: "jvV-z5F3oAo", @@ -258,7 +246,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(13), ), TrackItem( id: "u8_9cxlrh8k", @@ -275,7 +262,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(14), ), TrackItem( id: "gSvKcvM1Wk0", @@ -292,7 +278,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(15), ), TrackItem( id: "wQHgKRJ0pDQ", @@ -309,7 +294,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(16), ), TrackItem( id: "Ckz5i6-hzf0", @@ -326,7 +310,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(17), ), TrackItem( id: "y5zuUgyFqrc", @@ -343,7 +326,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(18), ), ], variants: [ diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_single.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_single.snap index 3d21a91..b79b023 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 @@ -62,7 +62,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(1), ), ], variants: [], diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_various_artists.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_album_various_artists.snap index 19db543..4e94524 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 @@ -44,7 +44,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(1), ), TrackItem( id: "9WYpLYAEub0", @@ -56,7 +55,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(2), ), TrackItem( id: "R48tE237bW4", @@ -73,7 +71,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(3), ), TrackItem( id: "-UzsoR6z-vg", @@ -85,7 +82,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(4), ), TrackItem( id: "kbNVyn8Ex28", @@ -97,7 +93,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(5), ), TrackItem( id: "NJrQZUzWP5Y", @@ -109,7 +104,6 @@ MusicAlbum( album: None, view_count: None, is_video: true, - track_nr: Some(6), ), ], variants: [], diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_long.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_long.snap index c9597e6..c98a052 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 @@ -57,7 +57,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "8rRj5ZXRNko", @@ -80,7 +79,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "lHZtcC67yrY", @@ -103,7 +101,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "TSkVVVBS9k8", @@ -126,7 +123,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "lc-cnCRhE7c", @@ -149,7 +145,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "3ryohiCVq3M", @@ -172,7 +167,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "BNHamTwxJ6Q", @@ -199,7 +193,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "5mqelmYUcI0", @@ -222,7 +215,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "k9EYjn5f_nE", @@ -245,7 +237,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "fkMg_X9lHMc", @@ -268,7 +259,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "4wOoLLDXbDY", @@ -291,7 +281,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "Z_mf9aCHag8", @@ -314,7 +303,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "cZ58odQo87A", @@ -337,7 +325,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "1il3RFk5Okw", @@ -360,7 +347,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "8WQMBv2deYQ", @@ -383,7 +369,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "vGrfFzagzHs", @@ -406,7 +391,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "1gDbpWC_9pE", @@ -429,7 +413,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "p-AWcCCbBHw", @@ -452,7 +435,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "RPN88D_HjMU", @@ -479,7 +461,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "5PST7Ld4wWU", @@ -502,7 +483,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "opoDBF_b-fg", @@ -525,7 +505,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "AMT9IOyXmBM", @@ -548,7 +527,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "VP5B1UmgHfc", @@ -571,7 +549,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "vcuQpbs0yT0", @@ -594,7 +571,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "LeMLVEJLruQ", @@ -617,7 +593,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "MtDPKJSsBgc", @@ -640,7 +615,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "4tDpYxNYqPg", @@ -663,7 +637,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "EkWjaoH7k6w", @@ -686,7 +659,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "tERRFWuYG48", @@ -709,7 +681,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "wCcJuN47UcY", @@ -732,7 +703,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "qdtLCfEcPL4", @@ -755,7 +725,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "wjXUBG15eZ8", @@ -778,7 +747,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "HBjDZMJUduo", @@ -801,7 +769,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "xkXQQ0IAbk0", @@ -824,7 +791,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "DraA3PUuoQc", @@ -847,7 +813,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "wMIGQp4YhuU", @@ -870,7 +835,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "38lrK74voaI", @@ -893,7 +857,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "2qW9rOSFF1M", @@ -920,7 +883,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "tMILH6UEfPA", @@ -943,7 +905,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "izHB2EdMngg", @@ -966,7 +927,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "haECT-SerHk", @@ -989,7 +949,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "cVikZ8Oe_XA", @@ -1012,7 +971,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "drFsXLChrWc", @@ -1035,7 +993,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "1EMFt7m_8yE", @@ -1058,7 +1015,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "_yWU0lFghxU", @@ -1081,7 +1037,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "XlD-LO3ogFM", @@ -1104,7 +1059,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "nAzjWqNfgvc", @@ -1131,7 +1085,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "PySC3RGhZJU", @@ -1154,7 +1107,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "G-iwLoyH6ZE", @@ -1177,7 +1129,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "fgCOUO-s8nY", @@ -1200,7 +1151,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "m-Ik3yy728Y", @@ -1223,7 +1173,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "U0_UYW5Y4cM", @@ -1246,7 +1195,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "rsrDYTEicq8", @@ -1269,7 +1217,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "2aU4wRgl_0E", @@ -1292,7 +1239,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "FzcJxJAxFtw", @@ -1319,7 +1265,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "2hyibXdOp5w", @@ -1342,7 +1287,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "YaKG5cUVB30", @@ -1365,7 +1309,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "Ahwc-ouFeTQ", @@ -1388,7 +1331,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "SoImFhORKpg", @@ -1411,7 +1353,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "jP4-XrbGt3M", @@ -1434,7 +1375,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "Yy2RsG4lnm4", @@ -1457,7 +1397,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "388e_8mu1t4", @@ -1480,7 +1419,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "dHHtPi-j7dQ", @@ -1503,7 +1441,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "d8ERTCVXIUE", @@ -1526,7 +1463,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "vQXn3EzzYY4", @@ -1549,7 +1485,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "zA-BTpC-yvI", @@ -1572,7 +1507,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "rnzIN9H_G10", @@ -1595,7 +1529,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "fcBbT1GTxqM", @@ -1618,7 +1551,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "wCDsm_dt1cI", @@ -1641,7 +1573,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "4j3AOJV1J8I", @@ -1664,7 +1595,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "RtuW08ZIgvg", @@ -1687,7 +1617,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "cbTXqKBIQ40", @@ -1710,7 +1639,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "oSd0Lph4luY", @@ -1733,7 +1661,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "oq0rrYrufYU", @@ -1756,7 +1683,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "0-P_YkS0z8s", @@ -1779,7 +1705,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "4BAKb2p450Q", @@ -1802,7 +1727,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "yqObMM_QzVQ", @@ -1825,7 +1749,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "dlvStoOyEzE", @@ -1848,7 +1771,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "VNttGAaek2U", @@ -1871,7 +1793,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "TxZMfufRJfo", @@ -1894,7 +1815,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "6agT2asF4as", @@ -1917,7 +1837,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "EcW0n83La5A", @@ -1940,7 +1859,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "_b61hg8UlZM", @@ -1963,7 +1881,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "kDMFranvFuQ", @@ -1986,7 +1903,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "1apku0pVDeE", @@ -2009,7 +1925,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "g6JYzOjglBs", @@ -2032,7 +1947,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "GYK-NfOo7b4", @@ -2055,7 +1969,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "omUuR45iU0g", @@ -2078,7 +1991,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "w7BE3inS-NM", @@ -2101,7 +2013,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "FM-5BPMnhm0", @@ -2124,7 +2035,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "MnNZNfixTOw", @@ -2147,7 +2057,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "qe80EeU8cT8", @@ -2170,7 +2079,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "-s2-6KYgqpQ", @@ -2193,7 +2101,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "RSlp874hESE", @@ -2220,7 +2127,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "oTI3tRQ_-3k", @@ -2243,7 +2149,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "_okA84gaEJw", @@ -2266,7 +2171,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "pLHnnJRaP7Q", @@ -2289,7 +2193,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "H2hGrsExuyc", @@ -2312,7 +2215,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "RsZvjqG2lec", @@ -2335,7 +2237,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "qYRCiQ6d35w", @@ -2362,7 +2263,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), ], ctoken: Some("4qmFsgI-EiRWTFBMNWREeDY4MVQ0YlI3WkYxSXVXek92MW9tbFJiRTdQaUoaFmVnWlFWRHBEUjFtU0FRTUl1Z1ElM0Q%3D"), diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_nomusic.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_nomusic.snap index c786be2..4001cf8 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 @@ -48,7 +48,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "RPGLMuxkLCs", @@ -66,7 +65,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "z-ALpnnQLrk", @@ -84,7 +82,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "_rrbTTv8zcQ", @@ -102,7 +99,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "JE16OKTawLw", @@ -120,7 +116,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "RQNY0Wzm7DQ", @@ -138,7 +133,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "uhy24PKBkd0", @@ -156,7 +150,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "OL1hQadBHfs", @@ -174,7 +167,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "Zge_SUfk0r8", @@ -192,7 +184,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "yFGIeU_IDE4", @@ -210,7 +201,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "P6MVqfQzPIg", @@ -228,7 +218,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "9n0pLDn8Z_I", @@ -246,7 +235,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "oXbx2YtIkeQ", @@ -264,7 +252,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "pfBBTTwxo8Q", @@ -282,7 +269,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "WxtRqzxSAh0", @@ -300,7 +286,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "ianUckvxtLw", @@ -318,7 +303,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "eb2Ghj1g1ic", @@ -336,7 +320,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "8TpEsyVtCog", @@ -354,7 +337,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "KD_WAei4LMg", @@ -372,7 +354,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "qfpOCrtweKk", @@ -390,7 +371,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "6gv3nrOA_bQ", @@ -408,7 +388,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "waaic6UnkU8", @@ -426,7 +405,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "lSy4MLC_uV4", @@ -444,7 +422,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "BuN8-U_quok", @@ -462,7 +439,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "g_UTG10nzaQ", @@ -480,7 +456,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "kNykFWaDbGw", @@ -498,7 +473,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "gJF7vxCYTgY", @@ -516,7 +490,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "CodZMQ_Anc0", @@ -534,7 +507,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "oKHMTKJdZ_M", @@ -552,7 +524,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "--O_Eyok_eE", @@ -570,7 +541,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "2bT3ljKMSo8", @@ -588,7 +558,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "YRAX_slrbsI", @@ -606,7 +575,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "aRRbCEwUSuw", @@ -624,7 +592,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "5sV8SzTbJS8", @@ -642,7 +609,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "ZxxZlU2o1TE", @@ -660,7 +626,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "gIjo5at4AxE", @@ -678,7 +643,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "NSGk7-kyeEU", @@ -696,7 +660,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "cgJtZ7Otc4Y", @@ -714,7 +677,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "l5LQu3Q0nWY", @@ -732,7 +694,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "YX4Z3ZlWUFc", @@ -750,7 +711,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "LoyvqR41lKw", @@ -768,7 +728,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "HbQtMZbtx_Q", @@ -786,7 +745,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "0DHRbP9ecgw", @@ -804,7 +762,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "rFOFkvk-xus", @@ -822,7 +779,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "P8zxnSihJ_8", @@ -840,7 +796,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "RWgeHl9XkCY", @@ -858,7 +813,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "I1n539enNNY", @@ -876,7 +830,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "70VKekyZz5g", @@ -894,7 +847,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "2OWJ1bwFu6Y", @@ -912,7 +864,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "zLiSA2i-niw", @@ -930,7 +881,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "wyXlw7nMpko", @@ -948,7 +898,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "NrU4fhzvFpA", @@ -966,7 +915,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "1xhKegaA1hQ", @@ -984,7 +932,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "9F4lZ8psBtg", @@ -1002,7 +949,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "G3uUtejX9to", @@ -1020,7 +966,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "-0Xn5pViCss", @@ -1038,7 +983,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "a7u71Fco99I", @@ -1056,7 +1000,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "H6uUbvcgKdk", @@ -1074,7 +1017,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "tPRTCauHtkw", @@ -1092,7 +1034,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "pMKAQExcarM", @@ -1110,7 +1051,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "7E-z-7KCdBI", @@ -1128,7 +1068,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "EPtbC0ZVddo", @@ -1146,7 +1085,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "TpPHng0eGJs", @@ -1164,7 +1102,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "rt2QFQwJYcs", @@ -1182,7 +1119,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "WPyfaztFDQ4", @@ -1200,7 +1136,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "5lmumP0DaUw", @@ -1218,7 +1153,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), ], ctoken: None, diff --git a/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_short.snap b/src/client/snapshots/rustypipe__client__music_playlist__tests__map_music_playlist_short.snap index 25100f3..0ae3e85 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 @@ -55,7 +55,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "nBZlrbrBO1I", @@ -78,7 +77,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "AcTDlsUej2w", @@ -101,7 +99,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "k6ZoE4RrcDs", @@ -124,7 +121,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "2n5GKLdrTfk", @@ -147,7 +143,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "psuRGfAaju4", @@ -170,7 +165,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "_JGGLJMpVks", @@ -193,7 +187,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "1YUBbF24H44", @@ -216,7 +209,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "E0WRQpjckYg", @@ -239,7 +231,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "mqiH0ZSkM9I", @@ -262,7 +253,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "UAWcs5H-qgQ", @@ -285,7 +275,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "bqO3Y5e4Dow", @@ -308,7 +297,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "ouEezpuPc3A", @@ -331,7 +319,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "i-qT5n_5Mys", @@ -354,7 +341,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "PMGY8fLwess", @@ -377,7 +363,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "2ebfSItB0oM", @@ -400,7 +385,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "c4BLVznuWnU", @@ -423,7 +407,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "c0wUKCekI34", @@ -446,7 +429,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "vNfgVjZF8_4", @@ -469,7 +451,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "XPpTgCho5ZA", @@ -492,7 +473,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "-oqAU5VxFWs", @@ -515,7 +495,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "CA1VHbdq5hY", @@ -538,7 +517,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "aNzCDt2eidg", @@ -561,7 +539,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "A48hOToMuRE", @@ -584,7 +561,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "qHm9MG9xw1o", @@ -607,7 +583,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "74NhLkjIeMs", @@ -630,7 +605,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "EptPhiK_q0E", @@ -653,7 +627,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "44u7_wQ1s0g", @@ -676,7 +649,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "toOyxylnNkI", @@ -699,7 +671,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "ljXSjIph5ZM", @@ -722,7 +693,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "DJFMRLIe-0o", @@ -749,7 +719,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "goqqohUitmw", @@ -772,7 +741,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "_LwX7GCE5rI", @@ -795,7 +763,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "7KHPC-kEQOA", @@ -822,7 +789,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "26PAgklYYvo", @@ -845,7 +811,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "bO3S8CKafbE", @@ -868,7 +833,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "tMsbeyeTtpk", @@ -891,7 +855,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "fvXn3rmhdc4", @@ -914,7 +877,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "2p4n7JgdCsc", @@ -937,7 +899,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "HtNS1afUOnE", @@ -960,7 +921,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "ufbDvPaVrzs", @@ -983,7 +943,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "H1_icnjg6MY", @@ -1006,7 +965,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "7Lna4Hu4-AQ", @@ -1033,7 +991,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "K9qu2QMBguw", @@ -1064,7 +1021,6 @@ MusicPlaylist( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "uWeqeQkjLto", @@ -1087,7 +1043,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "X_ZOGHUWwqE", @@ -1110,7 +1065,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "mHeK0Cwr9sg", @@ -1133,7 +1087,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "0Bf3CJZ4hvg", @@ -1156,7 +1109,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "7TCncxWNcPU", @@ -1179,7 +1131,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "PxNYvk_0Onw", @@ -1202,7 +1153,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "WLoWBe9BRP4", @@ -1225,7 +1175,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "1XYLKoEETVA", @@ -1248,7 +1197,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "Ghl_vkEV3tc", @@ -1271,7 +1219,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "5qHRMFQ0pLg", @@ -1294,7 +1241,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "X-vispdELDo", @@ -1317,7 +1263,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "il_L6c_fOvs", @@ -1340,7 +1285,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "hCjcgoubkPM", @@ -1363,7 +1307,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "nwXlRq_QyTI", @@ -1386,7 +1329,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "ZdsER1S3t8k", @@ -1413,7 +1355,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "fyrsExw_LUg", @@ -1436,7 +1377,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "BS4t017LSoA", @@ -1467,7 +1407,6 @@ MusicPlaylist( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "0AYzzzBaPBI", @@ -1490,7 +1429,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "zM0K3LC7Aak", @@ -1513,7 +1451,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "1le0xDbrVj8", @@ -1536,7 +1473,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "RdFaKz71-5M", @@ -1559,7 +1495,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "d6hUByfuhM4", @@ -1582,7 +1517,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "-uxeu0MbNR0", @@ -1605,7 +1539,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "35VK8yonvsc", @@ -1628,7 +1561,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "ELD3aRzbVQg", @@ -1651,7 +1583,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "BD7HwXv18aU", @@ -1674,7 +1605,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "WJJLfUwIVR4", @@ -1697,7 +1627,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "NjW1S0WIiJw", @@ -1720,7 +1649,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "-4szr0EMrgk", @@ -1743,7 +1671,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "88NWeOGrxys", @@ -1774,7 +1701,6 @@ MusicPlaylist( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "BxqtS-7GxFM", @@ -1797,7 +1723,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "KUKt_LbaBnM", @@ -1820,7 +1745,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "bhL7A8k6kU8", @@ -1843,7 +1767,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "mUN36hFtazE", @@ -1866,7 +1789,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "dcBZP_pt0uY", @@ -1889,7 +1811,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "m342B1Vv3tM", @@ -1912,7 +1833,6 @@ MusicPlaylist( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "N_5RiRBvPSk", @@ -1943,7 +1863,6 @@ MusicPlaylist( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "Q5kH0wg_sKo", @@ -1974,7 +1893,6 @@ MusicPlaylist( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "j9zlc5zufl8", @@ -2005,7 +1923,6 @@ MusicPlaylist( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "ufxjiU7BgR4", @@ -2036,7 +1953,6 @@ MusicPlaylist( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "7OfB_8rrtug", @@ -2067,7 +1983,6 @@ MusicPlaylist( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "UqmvAc81XuM", @@ -2098,7 +2013,6 @@ MusicPlaylist( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "QDULTFB8gSY", @@ -2129,7 +2043,6 @@ MusicPlaylist( )), view_count: None, is_video: false, - track_nr: None, ), ], ctoken: None, 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 7051978..6c3424c 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 @@ -25,7 +25,6 @@ MusicSearchResult( album: None, view_count: Some(235000000), is_video: true, - track_nr: None, ), TrackItem( id: "BL-aIpCLWnU", @@ -56,7 +55,6 @@ MusicSearchResult( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "cATe8Toht70", @@ -91,7 +89,6 @@ MusicSearchResult( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "WwNKyoizf8k", @@ -122,7 +119,6 @@ MusicSearchResult( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "yQUU29NwNF4", @@ -145,7 +141,6 @@ MusicSearchResult( album: None, view_count: Some(10000000), is_video: true, - track_nr: None, ), TrackItem( id: "Ky5RT5oGg0w", @@ -168,7 +163,6 @@ MusicSearchResult( album: None, view_count: Some(18000000), is_video: true, - track_nr: None, ), TrackItem( id: "dz9bieeSVRw", @@ -191,7 +185,6 @@ MusicSearchResult( album: None, view_count: Some(3200000), is_video: true, - track_nr: None, ), ], albums: [ diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_default.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_default.snap index c9454f0..b28be02 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 @@ -35,7 +35,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "cATe8Toht70", @@ -70,7 +69,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "0I1UpXSYdOQ", @@ -101,7 +99,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "9G2tG8V5_PY", @@ -132,7 +129,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "WwNKyoizf8k", @@ -163,7 +159,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "kS1o36LXQkc", @@ -194,7 +189,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "UQQ6L1j6mXE", @@ -225,7 +219,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "9l9dCro-7l8", @@ -256,7 +249,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "S_PRpDtgUfI", @@ -287,7 +279,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "Xt_ReZc0gnw", @@ -318,7 +309,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "diN3WCxpqis", @@ -349,7 +339,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "9q3FfH_57Rc", @@ -375,7 +364,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "U29V08A9yBs", @@ -410,7 +398,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "HHEKbGlLoEM", @@ -441,7 +428,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "qE_dGvQG1rU", @@ -472,7 +458,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "1tyPs3ccT7E", @@ -507,7 +492,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "6pSmQ-MHKbg", @@ -538,7 +522,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "rNsISA-kWzM", @@ -569,7 +552,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "AdvPpJVvyEg", @@ -600,7 +582,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "7q7o-kjIKpo", @@ -631,7 +612,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), ], ctoken: Some("EqQDEgtibGFjayBtYW1iYRqUA0VnV0tBUUlJQVVnVWFnd1FBeEFFRUFrUURoQUtFQVdDQVF0Q1RDMWhTWEJEVEZkdVZZSUJDMk5CVkdVNFZHOW9kRGN3Z2dFTE1Fa3hWWEJZVTFsa1QxR0NBUXM1UnpKMFJ6aFdOVjlRV1lJQkMxZDNUa3Q1YjJsNlpqaHJnZ0VMYTFNeGJ6TTJURmhSYTJPQ0FRdFZVVkUyVERGcU5tMVlSWUlCQ3psc09XUkRjbTh0TjJ3NGdnRUxVMTlRVW5CRWRHZFZaa21DQVF0WWRGOVNaVnBqTUdkdWQ0SUJDMlJwVGpOWFEzaHdjV2x6Z2dFTE9YRXpSbVpJWHpVM1VtT0NBUXRWTWpsV01EaEJPWGxDYzRJQkMwaElSVXRpUjJ4TWIwVk5nZ0VMY1VWZlpFZDJVVWN4Y2xXQ0FRdEVXak14Y0hoNVdXaFNhNElCQ3pad1UyMVJMVTFJUzJKbmdnRUxjazV6U1ZOQkxXdFhlazJDQVF0QlpIWlFjRXBXZG5sRlo0SUJDemR4TjI4dGEycEpTM0J2GPHq0C4%3D"), diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_typo.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_typo.snap index ff666e6..1bc7b4d 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 @@ -35,7 +35,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "pt0YvfnhGgI", @@ -66,7 +65,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "VinJmH-uidY", @@ -97,7 +95,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "YmSmymHRnEE", @@ -128,7 +125,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "TgfIbiHCOLo", @@ -159,7 +155,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "lCi6N_uq3vE", @@ -190,7 +185,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "QIjqe2B3RdQ", @@ -221,7 +215,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "q2pUotlXPeM", @@ -252,7 +245,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "0yPnvetCm-U", @@ -283,7 +275,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "EU5Vly60VGU", @@ -314,7 +305,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "UnxQ0TI4IMs", @@ -345,7 +335,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "ufpny1KxwcU", @@ -376,7 +365,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "duzWgZFJNwA", @@ -407,7 +395,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "rnXq-1n0lt0", @@ -438,7 +425,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "vHkqdC6-rOI", @@ -469,7 +455,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "nTlceSET_b8", @@ -495,7 +480,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "D8GhmRiIfxI", @@ -526,7 +510,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "01CS-jTaY1U", @@ -557,7 +540,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "2sKkKKKXO28", @@ -583,7 +565,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "czlgl6n9voM", @@ -614,7 +595,6 @@ MusicSearchFiltered( )), view_count: None, is_video: false, - track_nr: None, ), ], ctoken: Some("EqcDEg5saWJsaW5nc21lbnNjaBqUA0VnV0tBUUlJQVVnVWFnd1FBeEFFRUFrUURoQUtFQVdDQVFzMk5EZzFVR2hQZEVoNldZSUJDM0IwTUZsMlptNW9SMmRKZ2dFTFZtbHVTbTFJTFhWcFpGbUNBUXRaYlZOdGVXMUlVbTVGUllJQkMxUm5aa2xpYVVoRFQweHZnZ0VMYkVOcE5rNWZkWEV6ZGtXQ0FRdFJTV3B4WlRKQ00xSmtVWUlCQzNFeWNGVnZkR3hZVUdWTmdnRUxNSGxRYm5abGRFTnRMVldDQVF0RlZUVldiSGsyTUZaSFZZSUJDMVZ1ZUZFd1ZFazBTVTF6Z2dFTGRXWndibmt4UzNoM1kxV0NBUXRrZFhwWFoxcEdTazUzUVlJQkMzSnVXSEV0TVc0d2JIUXdnZ0VMZGtocmNXUkROaTF5VDBtQ0FRdHVWR3hqWlZORlZGOWlPSUlCQzBRNFIyaHRVbWxKWm5oSmdnRUxNREZEVXkxcVZHRlpNVldDQVFzeWMwdHJTMHRMV0U4eU9JSUJDMk42Ykdkc05tNDVkbTlOGPHq0C4%3D"), diff --git a/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_videos.snap b/src/client/snapshots/rustypipe__client__music_search__tests__map_music_search_tracks_videos.snap index e42c429..c23bd59 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 @@ -27,7 +27,6 @@ MusicSearchFiltered( album: None, view_count: Some(235000000), is_video: true, - track_nr: None, ), TrackItem( id: "vbl9KrZxOF8", @@ -50,7 +49,6 @@ MusicSearchFiltered( album: None, view_count: Some(6400), is_video: true, - track_nr: None, ), TrackItem( id: "eMfROJt0a7Q", @@ -73,7 +71,6 @@ MusicSearchFiltered( album: None, view_count: Some(701), is_video: true, - track_nr: None, ), TrackItem( id: "1ktLEhfkBCI", @@ -96,7 +93,6 @@ MusicSearchFiltered( album: None, view_count: Some(80000), is_video: true, - track_nr: None, ), TrackItem( id: "2hAlp3Khsnk", @@ -119,7 +115,6 @@ MusicSearchFiltered( album: None, view_count: Some(1100000), is_video: true, - track_nr: None, ), TrackItem( id: "CHixjhwY0ek", @@ -142,7 +137,6 @@ MusicSearchFiltered( album: None, view_count: Some(269000), is_video: true, - track_nr: None, ), TrackItem( id: "8YXKgZ393Ec", @@ -165,7 +159,6 @@ MusicSearchFiltered( album: None, view_count: Some(32000), is_video: true, - track_nr: None, ), TrackItem( id: "KFNznAXnjXc", @@ -188,7 +181,6 @@ MusicSearchFiltered( album: None, view_count: Some(179000), is_video: true, - track_nr: None, ), TrackItem( id: "hDhJeJZmTDA", @@ -211,7 +203,6 @@ MusicSearchFiltered( album: None, view_count: Some(69000), is_video: true, - track_nr: None, ), TrackItem( id: "6kKSDXiip_8", @@ -234,7 +225,6 @@ MusicSearchFiltered( album: None, view_count: Some(28000), is_video: true, - track_nr: None, ), TrackItem( id: "vfzlr70ogaI", @@ -257,7 +247,6 @@ MusicSearchFiltered( album: None, view_count: Some(1300000), is_video: true, - track_nr: None, ), TrackItem( id: "Fjth6cKGI88", @@ -280,7 +269,6 @@ MusicSearchFiltered( album: None, view_count: Some(3000000), is_video: true, - track_nr: None, ), TrackItem( id: "fznwvW9Kn4s", @@ -303,7 +291,6 @@ MusicSearchFiltered( album: None, view_count: Some(49000), is_video: true, - track_nr: None, ), TrackItem( id: "Jore0zZW-_M", @@ -326,7 +313,6 @@ MusicSearchFiltered( album: None, view_count: Some(29000), is_video: true, - track_nr: None, ), TrackItem( id: "_THM-2Ph-6I", @@ -349,7 +335,6 @@ MusicSearchFiltered( album: None, view_count: Some(823), is_video: true, - track_nr: None, ), TrackItem( id: "koJAGIUlnD0", @@ -372,7 +357,6 @@ MusicSearchFiltered( album: None, view_count: Some(1800000), is_video: true, - track_nr: None, ), TrackItem( id: "4tvQPrHcR4w", @@ -395,7 +379,6 @@ MusicSearchFiltered( album: None, view_count: Some(4400000), is_video: true, - track_nr: None, ), TrackItem( id: "CUh6MTvB_4E", @@ -418,7 +401,6 @@ MusicSearchFiltered( album: None, view_count: Some(1300), is_video: true, - track_nr: None, ), TrackItem( id: "4TWR90KJl84", @@ -441,7 +423,6 @@ MusicSearchFiltered( album: None, view_count: Some(249000000), is_video: true, - track_nr: None, ), TrackItem( id: "Cw7eMibV-Xk", @@ -464,7 +445,6 @@ MusicSearchFiltered( album: None, view_count: Some(15000), is_video: true, - track_nr: None, ), ], ctoken: Some("EqQDEgtibGFjayBtYW1iYRqUA0VnV0tBUUlRQVVnVWFnd1FBeEFFRUFrUURoQUtFQVdDQVF0YVpXVnljbTUxVEdrMVJZSUJDM1ppYkRsTGNscDRUMFk0Z2dFTFpVMW1VazlLZERCaE4xR0NBUXN4YTNSTVJXaG1hMEpEU1lJQkN6Sm9RV3h3TTB0b2MyNXJnZ0VMUTBocGVHcG9kMWt3Wld1Q0FRczRXVmhMWjFvek9UTkZZNElCQzB0R1RucHVRVmh1YWxoamdnRUxhRVJvU21WS1dtMVVSRUdDQVFzMmEwdFRSRmhwYVhCZk9JSUJDM1ptZW14eU56QnZaMkZKZ2dFTFJtcDBhRFpqUzBkSk9EaUNBUXRtZW01M2RsYzVTMjQwYzRJQkMwcHZjbVV3ZWxwWExWOU5nZ0VMWDFSSVRTMHlVR2d0TmttQ0FRdHJiMHBCUjBsVmJHNUVNSUlCQ3pSMGRsRlFja2hqVWpSM2dnRUxRMVZvTmsxVWRrSmZORVdDQVFzMFZGZFNPVEJMU213NE5JSUJDME4zTjJWTmFXSldMVmhyGPHq0C4%3D"), 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 2fb52a5..54db1c0 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 @@ -33,7 +33,6 @@ MusicSearchResult( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "pt0YvfnhGgI", @@ -64,7 +63,6 @@ MusicSearchResult( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "0yPnvetCm-U", @@ -95,7 +93,6 @@ MusicSearchResult( )), view_count: None, is_video: false, - track_nr: None, ), TrackItem( id: "3ryohiCVq3M", @@ -118,7 +115,6 @@ MusicSearchResult( album: None, view_count: Some(108000000), is_video: true, - track_nr: None, ), TrackItem( id: "6Bt1KeMNqvc", @@ -141,7 +137,6 @@ MusicSearchResult( album: None, view_count: Some(10000000), is_video: true, - track_nr: None, ), TrackItem( id: "5YQRHUItXTI", @@ -164,7 +159,6 @@ MusicSearchResult( album: None, view_count: Some(56000), is_video: true, - track_nr: None, ), ], albums: [ diff --git a/src/client/snapshots/rustypipe__client__pagination__tests__map_playlist_tracks.snap b/src/client/snapshots/rustypipe__client__pagination__tests__map_playlist_tracks.snap index 248e824..906ff25 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 @@ -26,7 +26,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "f9g6NCHQrcE", @@ -53,7 +52,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "CAVfEwrwT_o", @@ -80,7 +78,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "VUr9JZQ8F2g", @@ -103,7 +100,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "XQat6rNNbdQ", @@ -126,7 +122,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "EQyU6fGDn0c", @@ -149,7 +144,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "g4poKgQZX6w", @@ -172,7 +166,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "YTHr7gxwYUQ", @@ -195,7 +188,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "MfCSDn6q6j4", @@ -218,7 +210,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "gx9KFXb5x_o", @@ -241,7 +232,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "d7R7DQ5tlQo", @@ -264,7 +254,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "cZPjgcqHSa8", @@ -287,7 +276,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "ogDLdREonWY", @@ -310,7 +298,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "pRQpKprUUPY", @@ -333,7 +320,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "qZoQw9b4uCo", @@ -356,7 +342,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "q23qghoF6Nk", @@ -379,7 +364,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "yU0aKa7PFBg", @@ -402,7 +386,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "DVCAqvypaCc", @@ -425,7 +408,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "XdnI7sm6LeQ", @@ -448,7 +430,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "KcOXNSJtFLg", @@ -471,7 +452,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "K0UxHXZwgsg", @@ -494,7 +474,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "eyyNwOSQ3Yg", @@ -517,7 +496,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "1yskotqNuXI", @@ -540,7 +518,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "C03n4AAiL9w", @@ -563,7 +540,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "a2wNRTKRusM", @@ -586,7 +562,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "AIf61iHwWMQ", @@ -609,7 +584,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "BixqbSRjY2Y", @@ -632,7 +606,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "Acgy-3d4P6o", @@ -655,7 +628,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "5M_yA9M7yNc", @@ -678,7 +650,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "PjJuezhos3U", @@ -701,7 +672,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "XMutaJI2-kc", @@ -724,7 +694,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "Xac6Q7hcZkQ", @@ -747,7 +716,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "JfwjsjBcDoU", @@ -770,7 +738,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "zshiQUV3ohw", @@ -793,7 +760,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "g1eTAt1_VAM", @@ -820,7 +786,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "c3rLrFC8igY", @@ -838,7 +803,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "1im4DNEYzEM", @@ -865,7 +829,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "8BUxw9ocM2s", @@ -888,7 +851,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "g4cSpnGbHPE", @@ -915,7 +877,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "1Sdj9MiCowQ", @@ -942,7 +903,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "2DbR35g-0ZY", @@ -965,7 +925,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "j09hpp3AxIE", @@ -988,7 +947,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "J3GN6JXjV3g", @@ -1011,7 +969,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "pULl-p02upM", @@ -1034,7 +991,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "O6By8JeCtQQ", @@ -1057,7 +1013,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "NGn3IYQ7M7E", @@ -1080,7 +1035,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "o43oI5x86dI", @@ -1103,7 +1057,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "7TNqUrINxzs", @@ -1126,7 +1079,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "f3BD5Zm3cp0", @@ -1153,7 +1105,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "sF4yTDp95Eo", @@ -1176,7 +1127,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "1EwLNHg6ejY", @@ -1199,7 +1149,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "-l75qaSDWe8", @@ -1222,7 +1171,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "7h7ntYLLrfQ", @@ -1245,7 +1193,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "ApUl3Ops69M", @@ -1268,7 +1215,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "2YcJ8Wightw", @@ -1291,7 +1237,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "W3q8Od5qJio", @@ -1314,7 +1259,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "WPFLAjmWCtk", @@ -1337,7 +1281,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "tC76tIp0kBk", @@ -1360,7 +1303,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "kiMG_JV2gbo", @@ -1383,7 +1325,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "CrYYg_atdtk", @@ -1406,7 +1347,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "XTPGpBBwt1w", @@ -1429,7 +1369,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "uC08L4xxjNM", @@ -1452,7 +1391,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "5fAoV_AAMf0", @@ -1475,7 +1413,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "u5Vz7obL460", @@ -1498,7 +1435,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "ZPJlyRv_IGI", @@ -1521,7 +1457,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "s2SLbln-JwE", @@ -1544,7 +1479,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "28xHtRw6pG8", @@ -1567,7 +1501,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "joWoKqUTRvc", @@ -1590,7 +1523,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "XNMFTqhcNrE", @@ -1613,7 +1545,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "v3vPLgJ9FX8", @@ -1640,7 +1571,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "UFXOd179kOA", @@ -1663,7 +1593,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "4xRsDnKgHZc", @@ -1686,7 +1615,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "mE3IjoEqMqY", @@ -1709,7 +1637,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "E7e5vxKerqA", @@ -1732,7 +1659,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "axmZ_5Rx4Go", @@ -1755,7 +1681,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "44Ig6BsOCYA", @@ -1778,7 +1703,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "3iLBFEJjdN0", @@ -1801,7 +1725,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "M-ncq2eHF_k", @@ -1824,7 +1747,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "-AJoJ-ggiKI", @@ -1847,7 +1769,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "cgb-zp9DDHg", @@ -1874,7 +1795,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "Q7ZXg3KQLt0", @@ -1897,7 +1817,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "ysAEZOwp5rM", @@ -1920,7 +1839,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "m5vfng33SVE", @@ -1943,7 +1861,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "yMfgjVlGbUE", @@ -1966,7 +1883,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "OQIYEPe6DWY", @@ -1989,7 +1905,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "5FS8RIH7BpI", @@ -2012,7 +1927,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "zSRKgFB9piY", @@ -2035,7 +1949,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "e4eHhgwHCME", @@ -2062,7 +1975,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "q3hZvho7jNk", @@ -2085,7 +1997,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "0nWysyj_Z4Y", @@ -2108,7 +2019,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "aGCcLWU0OVo", @@ -2131,7 +2041,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "OQsXLK4MeEA", @@ -2154,7 +2063,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "xm7dxIqOO2M", @@ -2177,7 +2085,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "jlaaByab4Zk", @@ -2204,7 +2111,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "KG9-jSqXz4U", @@ -2227,7 +2133,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "7dISZnwsBSA", @@ -2250,7 +2155,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "F_PPdS-PB14", @@ -2273,7 +2177,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "DMg9idvVY8M", @@ -2296,7 +2199,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "DGEmoSFI94Y", @@ -2319,7 +2221,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), TrackItem( id: "BtZufymxHvE", @@ -2346,7 +2247,6 @@ Paginator( album: None, view_count: None, is_video: true, - track_nr: None, ), ], ctoken: Some("4qmFsgI8EiRWTFBMNWREeDY4MVQ0YlI3WkYxSXVXek92MW9tbFJiRTdQaUoaFGVnZFFWRHBEVGtGQ2tnRURDTG9F"), diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_20220924_newdesc.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_20220924_newdesc.snap index 5c7439a..cd5de92 100644 --- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_20220924_newdesc.snap +++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_20220924_newdesc.snap @@ -742,14 +742,12 @@ VideoDetails( count: Some(705000), items: [], ctoken: Some("Eg0SC1plZXJybnVMaTVFGAYyJSIRIgtaZWVycm51TGk1RTAAeAJCEGNvbW1lbnRzLXNlY3Rpb24%3D"), - visitor_data: Some("CgtCeURHR09uNlJ5TSjOiLqZBg%3D%3D"), endpoint: next, ), latest_comments: Paginator( count: Some(705000), items: [], ctoken: Some("Eg0SC1plZXJybnVMaTVFGAYyOCIRIgtaZWVycm51TGk1RTABeAIwAUIhZW5nYWdlbWVudC1wYW5lbC1jb21tZW50cy1zZWN0aW9u"), - visitor_data: Some("CgtCeURHR09uNlJ5TSjOiLqZBg%3D%3D"), endpoint: next, ), visitor_data: Some("CgtCeURHR09uNlJ5TSjOiLqZBg%3D%3D"), diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_20221011_new_continuation.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_20221011_new_continuation.snap index 9ffafe0..f7cc605 100644 --- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_20221011_new_continuation.snap +++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_20221011_new_continuation.snap @@ -816,14 +816,12 @@ VideoDetails( count: Some(705000), items: [], ctoken: Some("Eg0SC1plZXJybnVMaTVFGAYyJSIRIgtaZWVycm51TGk1RTAAeAJCEGNvbW1lbnRzLXNlY3Rpb24%3D"), - visitor_data: Some("Cgs2V0p6ZW5ab1ozTSjkrpaaBg%3D%3D"), endpoint: next, ), latest_comments: Paginator( count: Some(705000), items: [], ctoken: Some("Eg0SC1plZXJybnVMaTVFGAYyOCIRIgtaZWVycm51TGk1RTABeAIwAUIhZW5nYWdlbWVudC1wYW5lbC1jb21tZW50cy1zZWN0aW9u"), - visitor_data: Some("Cgs2V0p6ZW5ab1ozTSjkrpaaBg%3D%3D"), endpoint: next, ), visitor_data: Some("Cgs2V0p6ZW5ab1ozTSjkrpaaBg%3D%3D"), diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_20221011_rec_isr.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_20221011_rec_isr.snap index fb28d6a..64290ab 100644 --- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_20221011_rec_isr.snap +++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_20221011_rec_isr.snap @@ -1274,14 +1274,12 @@ VideoDetails( count: Some(3200), items: [], ctoken: Some("Eg0SC25GREJ4QlVmRTc0GAYyJSIRIgtuRkRCeEJVZkU3NDAAeAJCEGNvbW1lbnRzLXNlY3Rpb24%3D"), - visitor_data: Some("Cgtidzg4MlRTb3FKSSiqipeaBg%3D%3D"), endpoint: next, ), latest_comments: Paginator( count: Some(3200), items: [], ctoken: Some("Eg0SC25GREJ4QlVmRTc0GAYyOCIRIgtuRkRCeEJVZkU3NDABeAIwAUIhZW5nYWdlbWVudC1wYW5lbC1jb21tZW50cy1zZWN0aW9u"), - visitor_data: Some("Cgtidzg4MlRTb3FKSSiqipeaBg%3D%3D"), endpoint: next, ), visitor_data: Some("Cgtidzg4MlRTb3FKSSiqipeaBg%3D%3D"), diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_agegate.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_agegate.snap index d02577c..e347844 100644 --- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_agegate.snap +++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_agegate.snap @@ -46,14 +46,12 @@ VideoDetails( count: None, items: [], ctoken: Some("Eg0SC0hSS3UwY3Zycl9vGAYyJSIRIgtIUkt1MGN2cnJfbzABeAJCEGNvbW1lbnRzLXNlY3Rpb24%3D"), - visitor_data: Some("CgtxUUdrc1VSVE54Zyja1KiZBg%3D%3D"), endpoint: next, ), latest_comments: Paginator( count: None, items: [], ctoken: Some("Eg0SC0hSS3UwY3Zycl9vGAYyOCIRIgtIUkt1MGN2cnJfbzABeAIwAUIhZW5nYWdlbWVudC1wYW5lbC1jb21tZW50cy1zZWN0aW9u"), - visitor_data: Some("CgtxUUdrc1VSVE54Zyja1KiZBg%3D%3D"), endpoint: next, ), visitor_data: Some("CgtxUUdrc1VSVE54Zyja1KiZBg%3D%3D"), diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_ccommons.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_ccommons.snap index f366df2..4f09d28 100644 --- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_ccommons.snap +++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_ccommons.snap @@ -763,14 +763,12 @@ VideoDetails( count: Some(2200), items: [], ctoken: Some("Eg0SCzByYjlDZk92b2prGAYyJSIRIgswcmI5Q2ZPdm9qazAAeAJCEGNvbW1lbnRzLXNlY3Rpb24%3D"), - visitor_data: Some("CgtoY1pQUF8wNW1qayjSjpSZBg%3D%3D"), endpoint: next, ), latest_comments: Paginator( count: Some(2200), items: [], ctoken: Some("Eg0SCzByYjlDZk92b2prGAYyOCIRIgswcmI5Q2ZPdm9qazABeAIwAUIhZW5nYWdlbWVudC1wYW5lbC1jb21tZW50cy1zZWN0aW9u"), - visitor_data: Some("CgtoY1pQUF8wNW1qayjSjpSZBg%3D%3D"), endpoint: next, ), visitor_data: Some("CgtoY1pQUF8wNW1qayjSjpSZBg%3D%3D"), diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_chapters.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_chapters.snap index 8503def..cf0a7f7 100644 --- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_chapters.snap +++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_chapters.snap @@ -1231,14 +1231,12 @@ VideoDetails( count: Some(2900), items: [], ctoken: Some("Eg0SC25GREJ4QlVmRTc0GAYyJSIRIgtuRkRCeEJVZkU3NDAAeAJCEGNvbW1lbnRzLXNlY3Rpb24%3D"), - visitor_data: Some("CgtIV0JjSUtDQm9LQSjUjpSZBg%3D%3D"), endpoint: next, ), latest_comments: Paginator( count: Some(2900), items: [], ctoken: Some("Eg0SC25GREJ4QlVmRTc0GAYyOCIRIgtuRkRCeEJVZkU3NDABeAIwAUIhZW5nYWdlbWVudC1wYW5lbC1jb21tZW50cy1zZWN0aW9u"), - visitor_data: Some("CgtIV0JjSUtDQm9LQSjUjpSZBg%3D%3D"), endpoint: next, ), visitor_data: Some("CgtIV0JjSUtDQm9LQSjUjpSZBg%3D%3D"), diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_live.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_live.snap index 644b962..a13ff52 100644 --- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_live.snap +++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_live.snap @@ -822,14 +822,12 @@ VideoDetails( count: Some(0), items: [], ctoken: None, - visitor_data: Some("CgtnQS1WdzlNNkNCSSiSmKiZBg%3D%3D"), endpoint: next, ), latest_comments: Paginator( count: Some(0), items: [], ctoken: None, - visitor_data: Some("CgtnQS1WdzlNNkNCSSiSmKiZBg%3D%3D"), endpoint: next, ), visitor_data: Some("CgtnQS1WdzlNNkNCSSiSmKiZBg%3D%3D"), diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_music.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_music.snap index 5864af6..1063b37 100644 --- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_music.snap +++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_music.snap @@ -568,14 +568,12 @@ VideoDetails( count: Some(0), items: [], ctoken: None, - visitor_data: Some("CgtzclhqZVpoajVhVSi76qeZBg%3D%3D"), endpoint: next, ), latest_comments: Paginator( count: Some(0), items: [], ctoken: None, - visitor_data: Some("CgtzclhqZVpoajVhVSi76qeZBg%3D%3D"), endpoint: next, ), visitor_data: Some("CgtzclhqZVpoajVhVSi76qeZBg%3D%3D"), diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_mv.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_mv.snap index dda3300..35853c7 100644 --- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_mv.snap +++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_mv.snap @@ -779,14 +779,12 @@ VideoDetails( count: Some(705000), items: [], ctoken: Some("Eg0SC1plZXJybnVMaTVFGAYyJSIRIgtaZWVycm51TGk1RTAAeAJCEGNvbW1lbnRzLXNlY3Rpb24%3D"), - visitor_data: Some("Cgtjemd0bDVxU1N1QSjRjpSZBg%3D%3D"), endpoint: next, ), latest_comments: Paginator( count: Some(705000), items: [], ctoken: Some("Eg0SC1plZXJybnVMaTVFGAYyOCIRIgtaZWVycm51TGk1RTABeAIwAUIhZW5nYWdlbWVudC1wYW5lbC1jb21tZW50cy1zZWN0aW9u"), - visitor_data: Some("Cgtjemd0bDVxU1N1QSjRjpSZBg%3D%3D"), endpoint: next, ), visitor_data: Some("Cgtjemd0bDVxU1N1QSjRjpSZBg%3D%3D"), diff --git a/src/client/video_details.rs b/src/client/video_details.rs index 2294bf2..9ed6249 100644 --- a/src/client/video_details.rs +++ b/src/client/video_details.rs @@ -68,10 +68,6 @@ impl RustyPipeQuery { &request_body, ) .await - .map(|p| Paginator { - visitor_data: visitor_data.map(str::to_owned), - ..p - }) } } @@ -248,7 +244,6 @@ impl MapResponse for response::VideoDetails { _ => return Err(ExtractionError::InvalidData("invalid channel link".into())), }; - let visitor_data = self.response_context.visitor_data; let recommended = contents .two_column_watch_next_results .secondary_results @@ -257,7 +252,7 @@ impl MapResponse for response::VideoDetails { let mut res = map_recommendations( r, sr.secondary_results.continuations, - visitor_data.clone(), + self.response_context.visitor_data.clone(), lang, ); warnings.append(&mut res.warnings); @@ -338,17 +333,17 @@ impl MapResponse for response::VideoDetails { comment_count, Vec::new(), comment_ctoken, - visitor_data.clone(), + None, crate::param::ContinuationEndpoint::Next, ), latest_comments: Paginator::new_ext( comment_count, Vec::new(), latest_comments_ctoken, - visitor_data.clone(), + None, crate::param::ContinuationEndpoint::Next, ), - visitor_data, + visitor_data: self.response_context.visitor_data, }, warnings, }) diff --git a/src/model/mod.rs b/src/model/mod.rs index 49bc156..93cdec7 100644 --- a/src/model/mod.rs +++ b/src/model/mod.rs @@ -890,10 +890,6 @@ pub struct TrackItem { pub view_count: Option, /// True if the track is a music video pub is_video: bool, - /// Album track number - /// - /// [`None`] if the track is not fetched from an album. - pub track_nr: Option, } /// YouTube Music artist list item diff --git a/src/serializer/text.rs b/src/serializer/text.rs index c50d3d5..03195c9 100644 --- a/src/serializer/text.rs +++ b/src/serializer/text.rs @@ -374,8 +374,6 @@ impl TextComponent { } impl TextComponents { - /// Return the string representation of all text components - /// or [`None`] if there aren't any. pub fn to_opt_string(&self) -> Option { if self.0.is_empty() { None @@ -384,15 +382,6 @@ impl TextComponents { } } - /// 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() - } - - /// Split the text components using the given separation string. - /// - /// Example: `["Abc", "-", "Hello", "World", "-", "Xyz"]` -> - /// `["Abc"], ["Hello", "World"], ["Xyz"]` pub fn split(self, separator: &str) -> Vec { let mut buf = Vec::new(); let mut inner = Vec::new(); diff --git a/tests/youtube.rs b/tests/youtube.rs index cd58b5e..33733ef 100644 --- a/tests/youtube.rs +++ b/tests/youtube.rs @@ -502,13 +502,11 @@ async fn get_video_details_music() { assert!(!details.recommended.items.is_empty()); assert!(!details.recommended.is_exhausted()); - // Update(01.11.2022): comments are sometimes enabled - /* + // Comments are disabled for this video assert_eq!(details.top_comments.count, Some(0)); assert_eq!(details.latest_comments.count, Some(0)); assert!(details.top_comments.is_empty()); assert!(details.latest_comments.is_empty()); - */ } #[tokio::test]