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

Compare commits

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

No commits in common. "d38a1366e738db92f1b7a98e144d30ee340209ae" and "9e574d733dbf88961a93f12d52fcc994cbb3090a" have entirely different histories.
d38a1366e7 ... 9e574d733d

17 changed files with 27 additions and 346 deletions
Show stats Expand all files Collapse all files

2
Cargo.toml
View file

@ -33,7 +33,7 @@ quick-js-dtp = { version = "0.4.1", default-features = false, features = [
] }
once_cell = "1.12.0"
regex = "1.6.0"
fancy-regex = "0.13.0"
fancy-regex = "0.12.0"
thiserror = "1.0.36"
url = "2.2.2"
reqwest = { version = "0.11.11", default-features = false, features = [

2
src/client/channel.rs
View file

@ -529,7 +529,7 @@ fn map_channel_content(
.content
.section_list_renderer
.as_ref()
.and_then(|c| c.contents.c.first())
.and_then(|c| c.contents.c.get(0))
{
return Err(ExtractionError::Unavailable {
reason: crate::error::UnavailabilityReason::AgeRestricted,

2
src/client/music_playlist.rs
View file

@ -327,7 +327,7 @@ impl MapResponse<MusicAlbum> for response::MusicPlaylist {
let year_txt = subtitle_split
.swap_remove(2)
.0
.first()
.get(0)
.map(|c| c.as_str().to_owned());
(year_txt, subtitle_split.try_swap_remove(1))
}

14
src/client/response/mod.rs
View file

@ -335,14 +335,12 @@ impl From<Thumbnails> for Vec<crate::model::Thumbnail> {
impl From<Vec<ChannelBadge>> for crate::model::Verification {
fn from(badges: Vec<ChannelBadge>) -> Self {
badges
.first()
.map_or(crate::model::Verification::None, |b| {
match b.metadata_badge_renderer.style {
ChannelBadgeStyle::BadgeStyleTypeVerified => Self::Verified,
ChannelBadgeStyle::BadgeStyleTypeVerifiedArtist => Self::Artist,
}
})
badges.get(0).map_or(crate::model::Verification::None, |b| {
match b.metadata_badge_renderer.style {
ChannelBadgeStyle::BadgeStyleTypeVerified => Self::Verified,
ChannelBadgeStyle::BadgeStyleTypeVerifiedArtist => Self::Artist,
}
})
}
}

1
src/lib.rs
View file

@ -3,7 +3,6 @@
#![allow(
clippy::doc_markdown,
clippy::similar_names,
clippy::struct_field_names,
clippy::items_after_statements,
clippy::too_many_lines,
clippy::module_name_repetitions,

4
tests/snapshots/youtube__music_album_no_artist.snap
View file

@ -63,11 +63,11 @@ MusicAlbum(
cover: [],
artists: [
ArtistId(
id: Some("UCUhWwvF6gIPWTYlYb4-icLA"),
id: None,
name: "L.r. Eswari",
),
],
artist_id: Some("UCUhWwvF6gIPWTYlYb4-icLA"),
artist_id: None,
album: Some(AlbumId(
id: "MPREb_bqWA6mAZFWS",
name: "Pedha Rasi Peddamma Katha",

4
tests/snapshots/youtube__music_album_no_artist_intl.snap
View file

@ -63,11 +63,11 @@ MusicAlbum(
cover: [],
artists: [
ArtistId(
id: Some("UCUhWwvF6gIPWTYlYb4-icLA"),
id: None,
name: "[name]",
),
],
artist_id: Some("UCUhWwvF6gIPWTYlYb4-icLA"),
artist_id: None,
album: Some(AlbumId(
id: "MPREb_bqWA6mAZFWS",
name: "[name]",

20
tests/snapshots/youtube__music_album_one_artist.snap
View file

@ -29,14 +29,6 @@ MusicAlbum(
id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
name: "Demi Lovato",
),
ArtistId(
id: Some("UCKqVP7_535ELJu2OeEd3zzQ"),
name: "Missy Elliott",
),
ArtistId(
id: Some("UCStR3TnjvL7CL8ZNFPKmRXw"),
name: "Timbaland",
),
],
artist_id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
album: Some(AlbumId(
@ -58,10 +50,6 @@ MusicAlbum(
id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
name: "Demi Lovato",
),
ArtistId(
id: Some("UC58M_VmdxEw-h-p_HgeE0Zg"),
name: "Dev",
),
],
artist_id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
album: Some(AlbumId(
@ -83,10 +71,6 @@ MusicAlbum(
id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
name: "Demi Lovato",
),
ArtistId(
id: Some("UC0tIFKS5uijPeJLjH8uAWJg"),
name: "Iyaz",
),
],
artist_id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
album: Some(AlbumId(
@ -108,10 +92,6 @@ MusicAlbum(
id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
name: "Demi Lovato",
),
ArtistId(
id: Some("UCA7oqkXUZIlT8QXhxaIR4RA"),
name: "Jason Derulo",
),
],
artist_id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
album: Some(AlbumId(

20
tests/snapshots/youtube__music_album_one_artist_intl.snap
View file

@ -29,14 +29,6 @@ MusicAlbum(
id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
name: "[name]",
),
ArtistId(
id: Some("UCKqVP7_535ELJu2OeEd3zzQ"),
name: "[name]",
),
ArtistId(
id: Some("UCStR3TnjvL7CL8ZNFPKmRXw"),
name: "[name]",
),
],
artist_id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
album: Some(AlbumId(
@ -58,10 +50,6 @@ MusicAlbum(
id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
name: "[name]",
),
ArtistId(
id: Some("UC58M_VmdxEw-h-p_HgeE0Zg"),
name: "[name]",
),
],
artist_id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
album: Some(AlbumId(
@ -83,10 +71,6 @@ MusicAlbum(
id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
name: "[name]",
),
ArtistId(
id: Some("UC0tIFKS5uijPeJLjH8uAWJg"),
name: "[name]",
),
],
artist_id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
album: Some(AlbumId(
@ -108,10 +92,6 @@ MusicAlbum(
id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
name: "[name]",
),
ArtistId(
id: Some("UCA7oqkXUZIlT8QXhxaIR4RA"),
name: "[name]",
),
],
artist_id: Some("UCwem2sj-QUJCiWiPAo9JuAw"),
album: Some(AlbumId(

112
tests/snapshots/youtube__music_album_show.snap
View file

@ -12,10 +12,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
description: None,
@ -33,10 +29,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -58,10 +50,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -83,10 +71,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -108,10 +92,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -133,10 +113,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -158,10 +134,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -183,10 +155,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -208,10 +176,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -233,10 +197,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -258,10 +218,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -283,10 +239,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -308,10 +260,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -333,10 +281,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -358,10 +302,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -383,10 +323,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -408,10 +344,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -433,10 +365,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -458,10 +386,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -483,10 +407,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -508,10 +428,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -533,10 +449,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -558,10 +470,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -583,10 +491,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -608,10 +512,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -633,10 +533,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -658,10 +554,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -683,10 +575,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "Dimiter Inkiow",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "Griechische Mythologie für Kinder",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(

112
tests/snapshots/youtube__music_album_show_intl.snap
View file

@ -12,10 +12,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
description: "[description]",
@ -33,10 +29,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -58,10 +50,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -83,10 +71,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -108,10 +92,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -133,10 +113,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -158,10 +134,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -183,10 +155,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -208,10 +176,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -233,10 +197,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -258,10 +218,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -283,10 +239,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -308,10 +260,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -333,10 +281,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -358,10 +302,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -383,10 +323,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -408,10 +344,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -433,10 +365,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -458,10 +386,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -483,10 +407,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -508,10 +428,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -533,10 +449,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -558,10 +470,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -583,10 +491,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -608,10 +512,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -633,10 +533,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -658,10 +554,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(
@ -683,10 +575,6 @@ MusicAlbum(
id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
name: "[name]",
),
ArtistId(
id: Some("UCsg6xTDzVnvrcWhgLYX6_rg"),
name: "[name]",
),
],
artist_id: Some("UCAotr_lJ3JJ79DPRlA7k47w"),
album: Some(AlbumId(

25
tests/snapshots/youtube__music_album_unavailable.snap
View file

@ -7,25 +7,12 @@ MusicAlbum(
playlist_id: Some("OLAK5uy_mux5ygfN9sbiR1ma3yh1GHTmqNekZNoAI"),
name: "13 Reasons Why (Season 3)",
cover: "[cover]",
artists: [
ArtistId(
id: Some("UCCj0RlDqqahEB5BXVtDcPqg"),
name: "5 Seconds of Summer",
),
ArtistId(
id: Some("UCMrCoizKiBxqeg5pTpBXn1A"),
name: "YUNGBLUD",
),
ArtistId(
id: Some("UCvsgN5NKOzXnAURfaf3TOig"),
name: "Alexander 23",
),
],
artist_id: Some("UCCj0RlDqqahEB5BXVtDcPqg"),
artists: [],
artist_id: None,
description: None,
album_type: Album,
year: Some(2019),
by_va: false,
by_va: true,
tracks: [
TrackItem(
id: "R3VIKRtzAdE",
@ -264,16 +251,12 @@ MusicAlbum(
duration: Some(246),
cover: [],
artists: [
ArtistId(
id: Some("UCRBHsrbsZDxjHkcgMKEJwpw"),
name: "Brendan Angelides",
),
ArtistId(
id: Some("UC4YvDAbE1EYwZpj6gQ-lpLw"),
name: "Eskmo",
),
],
artist_id: Some("UCRBHsrbsZDxjHkcgMKEJwpw"),
artist_id: Some("UC4YvDAbE1EYwZpj6gQ-lpLw"),
album: Some(AlbumId(
id: "MPREb_AzuWg8qAVVl",
name: "13 Reasons Why (Season 3)",

25
tests/snapshots/youtube__music_album_unavailable_intl.snap
View file

@ -7,25 +7,12 @@ MusicAlbum(
playlist_id: Some("OLAK5uy_mux5ygfN9sbiR1ma3yh1GHTmqNekZNoAI"),
name: "[name]",
cover: "[cover]",
artists: [
ArtistId(
id: Some("UCCj0RlDqqahEB5BXVtDcPqg"),
name: "[name]",
),
ArtistId(
id: Some("UCMrCoizKiBxqeg5pTpBXn1A"),
name: "[name]",
),
ArtistId(
id: Some("UCvsgN5NKOzXnAURfaf3TOig"),
name: "[name]",
),
],
artist_id: Some("UCCj0RlDqqahEB5BXVtDcPqg"),
artists: [],
artist_id: None,
description: "[description]",
album_type: Album,
year: Some(2019),
by_va: false,
by_va: true,
tracks: [
TrackItem(
id: "R3VIKRtzAdE",
@ -264,16 +251,12 @@ MusicAlbum(
duration: Some(246),
cover: [],
artists: [
ArtistId(
id: Some("UCRBHsrbsZDxjHkcgMKEJwpw"),
name: "[name]",
),
ArtistId(
id: Some("UC4YvDAbE1EYwZpj6gQ-lpLw"),
name: "[name]",
),
],
artist_id: Some("UCRBHsrbsZDxjHkcgMKEJwpw"),
artist_id: Some("UC4YvDAbE1EYwZpj6gQ-lpLw"),
album: Some(AlbumId(
id: "MPREb_AzuWg8qAVVl",
name: "[name]",

4
tests/snapshots/youtube__music_album_various_artists.snap
View file

@ -105,11 +105,11 @@ MusicAlbum(
cover: [],
artists: [
ArtistId(
id: Some("UCa4ZqZPRjz9MYYnfpoh2few"),
id: None,
name: "LOONA",
),
],
artist_id: Some("UCa4ZqZPRjz9MYYnfpoh2few"),
artist_id: None,
album: Some(AlbumId(
id: "MPREb_8QkDeEIawvX",
name: "＜Queendom2＞ FINAL",

4
tests/snapshots/youtube__music_album_various_artists_intl.snap
View file

@ -105,11 +105,11 @@ MusicAlbum(
cover: [],
artists: [
ArtistId(
id: Some("UCa4ZqZPRjz9MYYnfpoh2few"),
id: None,
name: "[name]",
),
],
artist_id: Some("UCa4ZqZPRjz9MYYnfpoh2few"),
artist_id: None,
album: Some(AlbumId(
id: "MPREb_8QkDeEIawvX",
name: "[name]",

15
tests/snapshots/youtube__music_artist_basic_all_intl.snap
View file

@ -146,21 +146,6 @@ MusicArtist(
year: Some(2015),
by_va: false,
),
AlbumItem(
id: "MPREb_ghrNI6BJSM8",
name: "[name]",
cover: "[cover]",
artists: [
ArtistId(
id: Some("UCFKUUtHjT4iq3p0JJA13SOA"),
name: "[name]",
),
],
artist_id: Some("UCFKUUtHjT4iq3p0JJA13SOA"),
album_type: Album,
year: Some(2017),
by_va: false,
),
AlbumItem(
id: "MPREb_h0UZr2ALQXf",
name: "[name]",

7
tests/youtube.rs
View file

@ -827,7 +827,6 @@ fn channel_videos(rp: RustyPipe) {
}
#[rstest]
#[ignore]
fn channel_shorts(rp: RustyPipe) {
let channel = tokio_test::block_on(
rp.query()
@ -1007,9 +1006,8 @@ fn channel_more(
#[rstest]
#[case::videos("UCcdwLMPsaU2ezNSJU1nFoBQ", ChannelVideoTab::Videos)]
#[case::live("UCvqRdlKsE5Q8mf8YXbdIJLw", ChannelVideoTab::Live)]
#[ignore]
#[case::shorts("UCcdwLMPsaU2ezNSJU1nFoBQ", ChannelVideoTab::Shorts)]
#[case::live("UCvqRdlKsE5Q8mf8YXbdIJLw", ChannelVideoTab::Live)]
fn channel_order_latest(#[case] id: &str, #[case] tab: ChannelVideoTab, rp: RustyPipe) {
let latest = tokio_test::block_on(rp.query().channel_videos_tab_order(
id,
@ -1035,9 +1033,8 @@ fn channel_order_latest(#[case] id: &str, #[case] tab: ChannelVideoTab, rp: Rust
#[rstest]
#[case::videos("UCcdwLMPsaU2ezNSJU1nFoBQ", ChannelVideoTab::Videos, "XqZsoesa55w")]
#[case::live("UCvqRdlKsE5Q8mf8YXbdIJLw", ChannelVideoTab::Live, "ojes5ULOqhc")]
#[ignore]
#[case::shorts("UCcdwLMPsaU2ezNSJU1nFoBQ", ChannelVideoTab::Shorts, "k91vRvXGwHs")]
#[case::live("UCvqRdlKsE5Q8mf8YXbdIJLw", ChannelVideoTab::Live, "ojes5ULOqhc")]
fn channel_order_popular(
#[case] id: &str,
#[case] tab: ChannelVideoTab,