fix: improve album artist parsing, remove artists_txt field
This commit is contained in:
parent
a7db75ff07
commit
01a131ed6f
25 changed files with 5008 additions and 2659 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -8,12 +8,11 @@ MusicAlbum(
|
|||
name: "Waldbrand",
|
||||
cover: "[cover]",
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCpJyCbFbdTrx0M90HCNBHFQ",
|
||||
ArtistId(
|
||||
id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"),
|
||||
name: "Madeline Juno",
|
||||
),
|
||||
],
|
||||
artists_txt: "Madeline Juno",
|
||||
album_type: Ep,
|
||||
year: Some(2016),
|
||||
by_va: false,
|
||||
|
|
@ -24,15 +23,17 @@ MusicAlbum(
|
|||
duration: 221,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCpJyCbFbdTrx0M90HCNBHFQ",
|
||||
ArtistId(
|
||||
id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"),
|
||||
name: "Madeline Juno",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Madeline Juno"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_u1I69lSAe5v",
|
||||
name: "Waldbrand",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(1),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -41,15 +42,17 @@ MusicAlbum(
|
|||
duration: 208,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCpJyCbFbdTrx0M90HCNBHFQ",
|
||||
ArtistId(
|
||||
id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"),
|
||||
name: "Madeline Juno",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Madeline Juno"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_u1I69lSAe5v",
|
||||
name: "Waldbrand",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(2),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -58,15 +61,17 @@ MusicAlbum(
|
|||
duration: 223,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCpJyCbFbdTrx0M90HCNBHFQ",
|
||||
ArtistId(
|
||||
id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"),
|
||||
name: "Madeline Juno",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Madeline Juno"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_u1I69lSAe5v",
|
||||
name: "Waldbrand",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(3),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -75,15 +80,17 @@ MusicAlbum(
|
|||
duration: 221,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCpJyCbFbdTrx0M90HCNBHFQ",
|
||||
ArtistId(
|
||||
id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"),
|
||||
name: "Madeline Juno",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Madeline Juno"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_u1I69lSAe5v",
|
||||
name: "Waldbrand",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(4),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -92,15 +99,17 @@ MusicAlbum(
|
|||
duration: 197,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCpJyCbFbdTrx0M90HCNBHFQ",
|
||||
ArtistId(
|
||||
id: Some("UCpJyCbFbdTrx0M90HCNBHFQ"),
|
||||
name: "Madeline Juno",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Madeline Juno"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_u1I69lSAe5v",
|
||||
name: "Waldbrand",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(5),
|
||||
),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -8,12 +8,11 @@ MusicAlbum(
|
|||
name: "Märchen enden gut",
|
||||
cover: "[cover]",
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: "Oonagh",
|
||||
album_type: Album,
|
||||
year: Some(2016),
|
||||
by_va: false,
|
||||
|
|
@ -24,15 +23,17 @@ MusicAlbum(
|
|||
duration: 216,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(1),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -41,15 +42,17 @@ MusicAlbum(
|
|||
duration: 224,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(2),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -58,15 +61,17 @@ MusicAlbum(
|
|||
duration: 176,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(3),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -75,15 +80,17 @@ MusicAlbum(
|
|||
duration: 215,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(4),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -92,15 +99,17 @@ MusicAlbum(
|
|||
duration: 268,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(5),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -109,15 +118,17 @@ MusicAlbum(
|
|||
duration: 202,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(6),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -126,15 +137,17 @@ MusicAlbum(
|
|||
duration: 185,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(7),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -143,15 +156,17 @@ MusicAlbum(
|
|||
duration: 226,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(8),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -160,15 +175,17 @@ MusicAlbum(
|
|||
duration: 207,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(9),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -177,15 +194,17 @@ MusicAlbum(
|
|||
duration: 211,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(10),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -194,15 +213,17 @@ MusicAlbum(
|
|||
duration: 179,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(11),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -211,15 +232,17 @@ MusicAlbum(
|
|||
duration: 218,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(12),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -228,15 +251,17 @@ MusicAlbum(
|
|||
duration: 277,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(13),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -245,15 +270,17 @@ MusicAlbum(
|
|||
duration: 204,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(14),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -262,15 +289,17 @@ MusicAlbum(
|
|||
duration: 202,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(15),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -279,15 +308,17 @@ MusicAlbum(
|
|||
duration: 222,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(16),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -296,15 +327,17 @@ MusicAlbum(
|
|||
duration: 177,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(17),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -313,15 +346,17 @@ MusicAlbum(
|
|||
duration: 220,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Oonagh"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_nlBWQROfvjo",
|
||||
name: "Märchen enden gut",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(18),
|
||||
),
|
||||
],
|
||||
|
|
@ -342,14 +377,14 @@ MusicAlbum(
|
|||
),
|
||||
],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UC_vmjW5e1xEHhYjY2a0kK1A",
|
||||
ArtistId(
|
||||
id: Some("UC_vmjW5e1xEHhYjY2a0kK1A"),
|
||||
name: "Oonagh",
|
||||
),
|
||||
],
|
||||
artists_txt: "Oonagh",
|
||||
album_type: Album,
|
||||
year: None,
|
||||
by_va: false,
|
||||
),
|
||||
],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -8,12 +8,11 @@ MusicAlbum(
|
|||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
cover: "[cover]",
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: "Kingdom Force",
|
||||
album_type: Show,
|
||||
year: Some(2022),
|
||||
by_va: false,
|
||||
|
|
@ -24,15 +23,17 @@ MusicAlbum(
|
|||
duration: 229,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(1),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -41,15 +42,17 @@ MusicAlbum(
|
|||
duration: 235,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(2),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -58,15 +61,17 @@ MusicAlbum(
|
|||
duration: 197,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(3),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -75,15 +80,17 @@ MusicAlbum(
|
|||
duration: 186,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(4),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -92,15 +99,17 @@ MusicAlbum(
|
|||
duration: 188,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(5),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -109,15 +118,17 @@ MusicAlbum(
|
|||
duration: 205,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(6),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -126,15 +137,17 @@ MusicAlbum(
|
|||
duration: 219,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(7),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -143,15 +156,17 @@ MusicAlbum(
|
|||
duration: 240,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(8),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -160,15 +175,17 @@ MusicAlbum(
|
|||
duration: 239,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(9),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -177,15 +194,17 @@ MusicAlbum(
|
|||
duration: 197,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(10),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -194,15 +213,17 @@ MusicAlbum(
|
|||
duration: 201,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(11),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -211,15 +232,17 @@ MusicAlbum(
|
|||
duration: 187,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(12),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -228,15 +251,17 @@ MusicAlbum(
|
|||
duration: 183,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(13),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -245,15 +270,17 @@ MusicAlbum(
|
|||
duration: 193,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCNoyEM0e2A7WlsBmP2w3avg",
|
||||
ArtistId(
|
||||
id: Some("UCNoyEM0e2A7WlsBmP2w3avg"),
|
||||
name: "Kingdom Force",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kingdom Force"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_cwzk8EUwypZ",
|
||||
name: "Folge 2: Eiszeit (Das Original-Hörspiel zur TV-Serie)",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(14),
|
||||
),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -8,16 +8,15 @@ MusicAlbum(
|
|||
name: "Der Himmel reißt auf",
|
||||
cover: "[cover]",
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCXGYZ-OhdOpPBamHX3K9YRg",
|
||||
ArtistId(
|
||||
id: Some("UCXGYZ-OhdOpPBamHX3K9YRg"),
|
||||
name: "Joel Brandenstein",
|
||||
),
|
||||
ChannelId(
|
||||
id: "UCFTcSVPYRWlDoHisR-ZKwgw",
|
||||
ArtistId(
|
||||
id: Some("UCFTcSVPYRWlDoHisR-ZKwgw"),
|
||||
name: "Vanessa Mai",
|
||||
),
|
||||
],
|
||||
artists_txt: "Joel Brandenstein & Vanessa Mai",
|
||||
album_type: Single,
|
||||
year: Some(2020),
|
||||
by_va: false,
|
||||
|
|
@ -28,19 +27,21 @@ MusicAlbum(
|
|||
duration: 183,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCXGYZ-OhdOpPBamHX3K9YRg",
|
||||
ArtistId(
|
||||
id: Some("UCXGYZ-OhdOpPBamHX3K9YRg"),
|
||||
name: "Joel Brandenstein",
|
||||
),
|
||||
ChannelId(
|
||||
id: "UCFTcSVPYRWlDoHisR-ZKwgw",
|
||||
ArtistId(
|
||||
id: Some("UCFTcSVPYRWlDoHisR-ZKwgw"),
|
||||
name: "Vanessa Mai",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Joel Brandenstein & Vanessa Mai"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_bHfHGoy7vuv",
|
||||
name: "Der Himmel reißt auf",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(1),
|
||||
),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ MusicAlbum(
|
|||
name: "<Queendom2> FINAL",
|
||||
cover: "[cover]",
|
||||
artists: [],
|
||||
artists_txt: "Various Artists",
|
||||
album_type: Single,
|
||||
year: Some(2022),
|
||||
by_va: true,
|
||||
|
|
@ -18,11 +17,18 @@ MusicAlbum(
|
|||
title: "Waka Boom (My Way) (feat. Lee Young Ji)",
|
||||
duration: 274,
|
||||
cover: [],
|
||||
artists: [],
|
||||
artists_txt: Some("HYOLYN"),
|
||||
album: None,
|
||||
artists: [
|
||||
ArtistId(
|
||||
id: None,
|
||||
name: "HYOLYN",
|
||||
),
|
||||
],
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_8QkDeEIawvX",
|
||||
name: "<Queendom2> FINAL",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(1),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -30,11 +36,18 @@ MusicAlbum(
|
|||
title: "AURA",
|
||||
duration: 216,
|
||||
cover: [],
|
||||
artists: [],
|
||||
artists_txt: Some("WJSN"),
|
||||
album: None,
|
||||
artists: [
|
||||
ArtistId(
|
||||
id: None,
|
||||
name: "WJSN",
|
||||
),
|
||||
],
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_8QkDeEIawvX",
|
||||
name: "<Queendom2> FINAL",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(2),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -43,15 +56,17 @@ MusicAlbum(
|
|||
duration: 239,
|
||||
cover: [],
|
||||
artists: [
|
||||
ChannelId(
|
||||
id: "UCAKvDuIX3m1AUdPpDSqV_3w",
|
||||
ArtistId(
|
||||
id: Some("UCAKvDuIX3m1AUdPpDSqV_3w"),
|
||||
name: "Kep1er",
|
||||
),
|
||||
],
|
||||
artists_txt: Some("Kep1er"),
|
||||
album: None,
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_8QkDeEIawvX",
|
||||
name: "<Queendom2> FINAL",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(3),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -59,11 +74,18 @@ MusicAlbum(
|
|||
title: "Red Sun!",
|
||||
duration: 254,
|
||||
cover: [],
|
||||
artists: [],
|
||||
artists_txt: Some("VIVIZ"),
|
||||
album: None,
|
||||
artists: [
|
||||
ArtistId(
|
||||
id: None,
|
||||
name: "VIVIZ",
|
||||
),
|
||||
],
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_8QkDeEIawvX",
|
||||
name: "<Queendom2> FINAL",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(4),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -71,11 +93,18 @@ MusicAlbum(
|
|||
title: "POSE",
|
||||
duration: 187,
|
||||
cover: [],
|
||||
artists: [],
|
||||
artists_txt: Some("LOONA"),
|
||||
album: None,
|
||||
artists: [
|
||||
ArtistId(
|
||||
id: None,
|
||||
name: "LOONA",
|
||||
),
|
||||
],
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_8QkDeEIawvX",
|
||||
name: "<Queendom2> FINAL",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(5),
|
||||
),
|
||||
TrackItem(
|
||||
|
|
@ -83,11 +112,18 @@ MusicAlbum(
|
|||
title: "Whistle",
|
||||
duration: 224,
|
||||
cover: [],
|
||||
artists: [],
|
||||
artists_txt: Some("Brave Girls"),
|
||||
album: None,
|
||||
artists: [
|
||||
ArtistId(
|
||||
id: None,
|
||||
name: "Brave Girls",
|
||||
),
|
||||
],
|
||||
album: Some(AlbumId(
|
||||
id: "MPREb_8QkDeEIawvX",
|
||||
name: "<Queendom2> FINAL",
|
||||
)),
|
||||
view_count: None,
|
||||
is_video: true,
|
||||
is_video: false,
|
||||
track_nr: Some(6),
|
||||
),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1386,10 +1386,13 @@ async fn music_search(#[case] typo: bool) {
|
|||
assert_eq!(track.duration, 230);
|
||||
assert!(!track.cover.is_empty(), "got no cover");
|
||||
|
||||
assert_eq!(track.artists.len(), 1);
|
||||
let track_artist = &track.artists[0];
|
||||
assert_eq!(track_artist.id, "UCEdZAdnnKqbaHOlv8nM6OtA");
|
||||
assert_eq!(
|
||||
track_artist.id.as_ref().unwrap(),
|
||||
"UCEdZAdnnKqbaHOlv8nM6OtA"
|
||||
);
|
||||
assert_eq!(track_artist.name, "aespa");
|
||||
assert_eq!(track.artists_txt.as_ref().unwrap(), "aespa");
|
||||
assert_eq!(track.album, None);
|
||||
assert_gte(track.view_count.unwrap(), 230_000_000, "views");
|
||||
assert!(track.is_video, "got no video");
|
||||
|
|
@ -1414,10 +1417,13 @@ async fn music_search_tracks(#[case] videos: bool) {
|
|||
assert_eq!(track.is_video, videos);
|
||||
assert_eq!(track.track_nr, None);
|
||||
|
||||
assert_eq!(track.artists.len(), 1);
|
||||
let track_artist = &track.artists[0];
|
||||
assert_eq!(track_artist.id, "UCEdZAdnnKqbaHOlv8nM6OtA");
|
||||
assert_eq!(
|
||||
track_artist.id.as_ref().unwrap(),
|
||||
"UCEdZAdnnKqbaHOlv8nM6OtA"
|
||||
);
|
||||
assert_eq!(track_artist.name, "aespa");
|
||||
assert_eq!(track.artists_txt.as_ref().unwrap(), "aespa");
|
||||
|
||||
if videos {
|
||||
assert_eq!(track.id, "ZeerrnuLi5E");
|
||||
|
|
@ -1484,10 +1490,10 @@ async fn music_search_albums(
|
|||
let album = &res.items.items[0];
|
||||
assert_eq!(album.name, name);
|
||||
assert_eq!(album.id, id);
|
||||
assert_eq!(album.artists_txt, artist);
|
||||
|
||||
assert_eq!(album.artists.len(), 1);
|
||||
let album_artist = &album.artists[0];
|
||||
assert_eq!(album_artist.id, artist_id);
|
||||
assert_eq!(album_artist.id.as_ref().unwrap(), artist_id);
|
||||
assert_eq!(album_artist.name, artist);
|
||||
|
||||
assert!(!album.cover.is_empty(), "got no cover");
|
||||
|
|
|
|||
Reference in a new issue