Compare commits
No commits in common. "452f765ffd4e4d9a5ad95829fff57d0bced9b280" and "1ec1666d770e86db894f50eba30c0d53e20a1827" have entirely different histories.
452f765ffd
...
1ec1666d77
28 changed files with 3111 additions and 3305 deletions
|
|
@ -26,7 +26,6 @@ pub enum ABTest {
|
|||
ShortDateFormat = 7,
|
||||
TrackViewcount = 8,
|
||||
PlaylistsForShorts = 9,
|
||||
ChannelAboutModal = 10,
|
||||
}
|
||||
|
||||
const TESTS_TO_RUN: [ABTest; 3] = [
|
||||
|
|
@ -99,7 +98,6 @@ pub async fn run_test(
|
|||
ABTest::ShortDateFormat => short_date_format(&query).await,
|
||||
ABTest::PlaylistsForShorts => playlists_for_shorts(&query).await,
|
||||
ABTest::TrackViewcount => track_viewcount(&query).await,
|
||||
ABTest::ChannelAboutModal => channel_about_modal(&query).await,
|
||||
}
|
||||
.unwrap();
|
||||
pb.inc(1);
|
||||
|
|
@ -261,16 +259,6 @@ pub async fn short_date_format(rp: &RustyPipeQuery) -> Result<bool> {
|
|||
}))
|
||||
}
|
||||
|
||||
pub async fn playlists_for_shorts(rp: &RustyPipeQuery) -> Result<bool> {
|
||||
let playlist = rp.playlist("UUSHh8gHdtzO2tXd593_bjErWg").await?;
|
||||
let v1 = playlist
|
||||
.videos
|
||||
.items
|
||||
.first()
|
||||
.ok_or_else(|| anyhow::anyhow!("no videos"))?;
|
||||
Ok(v1.publish_date_txt.is_none())
|
||||
}
|
||||
|
||||
pub async fn track_viewcount(rp: &RustyPipeQuery) -> Result<bool> {
|
||||
let res = rp.music_search("lieblingsmensch namika").await?;
|
||||
|
||||
|
|
@ -285,19 +273,12 @@ pub async fn track_viewcount(rp: &RustyPipeQuery) -> Result<bool> {
|
|||
Ok(track.view_count.is_some())
|
||||
}
|
||||
|
||||
pub async fn channel_about_modal(rp: &RustyPipeQuery) -> Result<bool> {
|
||||
let id = "UC2DjFE7Xf11URZqWBigcVOQ";
|
||||
let res = rp
|
||||
.raw(
|
||||
ClientType::Desktop,
|
||||
"browse",
|
||||
&QBrowse {
|
||||
context: rp.get_context(ClientType::Desktop, true, None).await,
|
||||
browse_id: id,
|
||||
params: None,
|
||||
},
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
Ok(!res.contains("\"EgVhYm91dPIGBAoCEgA%3D\""))
|
||||
pub async fn playlists_for_shorts(rp: &RustyPipeQuery) -> Result<bool> {
|
||||
let playlist = rp.playlist("UUSHh8gHdtzO2tXd593_bjErWg").await?;
|
||||
let v1 = playlist
|
||||
.videos
|
||||
.items
|
||||
.first()
|
||||
.ok_or_else(|| anyhow::anyhow!("no videos"))?;
|
||||
Ok(v1.publish_date_txt.is_none())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -339,7 +339,7 @@ async fn channel_playlists() {
|
|||
}
|
||||
|
||||
async fn channel_info() {
|
||||
let json_path = path!(*TESTFILES_DIR / "channel" / "channel_info2.json");
|
||||
let json_path = path!(*TESTFILES_DIR / "channel" / "channel_info.json");
|
||||
if json_path.exists() {
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -202,20 +202,11 @@ pub enum Country {
|
|||
.to_owned();
|
||||
|
||||
let mut code_lang_array = format!(
|
||||
r#"/// Array of all available languages
|
||||
/// The languages are sorted by their native names. This array can be used to display
|
||||
/// a language selection or to get the language code from a language name using binary search.
|
||||
pub const LANGUAGES: [Language; {}] = [
|
||||
"#,
|
||||
"/// Array of all available languages\npub const LANGUAGES: [Language; {}] = [\n",
|
||||
languages.len()
|
||||
);
|
||||
let mut code_country_array = format!(
|
||||
r#"/// Array of all available countries
|
||||
///
|
||||
/// The countries are sorted by their english names. This array can be used to display
|
||||
/// a country selection or to get the country code from a country name using binary search.
|
||||
pub const COUNTRIES: [Country; {}] = [
|
||||
"#,
|
||||
"/// Array of all available countries\npub const COUNTRIES: [Country; {}] = [\n",
|
||||
countries.len()
|
||||
);
|
||||
|
||||
|
|
@ -261,6 +252,9 @@ pub const COUNTRIES: [Country; {}] = [
|
|||
code_langs += &enum_name;
|
||||
code_langs += ",\n";
|
||||
|
||||
// Language array
|
||||
writeln!(code_lang_array, " Language::{enum_name},").unwrap();
|
||||
|
||||
// Language names
|
||||
writeln!(
|
||||
code_lang_names,
|
||||
|
|
@ -270,24 +264,6 @@ pub const COUNTRIES: [Country; {}] = [
|
|||
}
|
||||
code_langs += "}\n";
|
||||
|
||||
// Language array
|
||||
let languages_by_name = languages
|
||||
.iter()
|
||||
.map(|(k, v)| (v, k))
|
||||
.collect::<BTreeMap<_, _>>();
|
||||
for code in languages_by_name.values() {
|
||||
let enum_name = code.split('-').fold(String::new(), |mut output, c| {
|
||||
let _ = write!(
|
||||
output,
|
||||
"{}{}",
|
||||
c[0..1].to_owned().to_uppercase(),
|
||||
c[1..].to_owned().to_lowercase()
|
||||
);
|
||||
output
|
||||
});
|
||||
writeln!(code_lang_array, " Language::{enum_name},").unwrap();
|
||||
}
|
||||
|
||||
for (c, n) in &countries {
|
||||
let enum_name = c[0..1].to_owned().to_uppercase() + &c[1..].to_owned().to_lowercase();
|
||||
|
||||
|
|
@ -295,6 +271,9 @@ pub const COUNTRIES: [Country; {}] = [
|
|||
writeln!(code_countries, " /// {n}").unwrap();
|
||||
writeln!(code_countries, " {enum_name},").unwrap();
|
||||
|
||||
// Country array
|
||||
writeln!(code_country_array, " Country::{enum_name},").unwrap();
|
||||
|
||||
// Country names
|
||||
writeln!(
|
||||
code_country_names,
|
||||
|
|
@ -303,16 +282,6 @@ pub const COUNTRIES: [Country; {}] = [
|
|||
.unwrap();
|
||||
}
|
||||
|
||||
// Country array
|
||||
let countries_by_name = countries
|
||||
.iter()
|
||||
.map(|(k, v)| (v, k))
|
||||
.collect::<BTreeMap<_, _>>();
|
||||
for c in countries_by_name.values() {
|
||||
let enum_name = c[0..1].to_owned().to_uppercase() + &c[1..].to_owned().to_lowercase();
|
||||
writeln!(code_country_array, " Country::{enum_name},").unwrap();
|
||||
}
|
||||
|
||||
// Add Country::Zz / Global
|
||||
code_countries += " /// Global (can only be used for music charts)\n";
|
||||
code_countries += " Zz,\n";
|
||||
|
|
|
|||
|
|
@ -417,18 +417,3 @@ tab.
|
|||
|
||||
Since the reel items dont include upload date information you can circumvent this new UI
|
||||
by using the mobile client. But that may change in the future.
|
||||
|
||||
## [10] Channel About modal
|
||||
|
||||
- **Encountered on:** 03.11.2023
|
||||
- **Impact:** 🟡 Medium
|
||||
- **Endpoint:** browse (channel info)
|
||||
|
||||
|
||||
|
||||
YouTube replaced the *About* channel tab with a modal. This changes the way additional
|
||||
channel metadata has to be fetched.
|
||||
|
||||
The new modal uses a continuation request with a token which can be easily generated.
|
||||
Attempts to fetch the old about tab with the A/B test enabled will lead to a redirect to
|
||||
the main tab.
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 43 KiB |
|
|
@ -1,21 +1,20 @@
|
|||
use std::fmt::Debug;
|
||||
|
||||
use serde::Serialize;
|
||||
use time::OffsetDateTime;
|
||||
use url::Url;
|
||||
|
||||
use crate::{
|
||||
error::{Error, ExtractionError},
|
||||
model::{
|
||||
paginator::{ContinuationEndpoint, Paginator},
|
||||
Channel, ChannelInfo, PlaylistItem, VideoItem,
|
||||
Channel, ChannelInfo, PlaylistItem, VideoItem, YouTubeItem,
|
||||
},
|
||||
param::{ChannelOrder, ChannelVideoTab, Language},
|
||||
serializer::{text::TextComponent, MapResult},
|
||||
util::{self, timeago, ProtoBuilder},
|
||||
serializer::MapResult,
|
||||
util::{self, ProtoBuilder},
|
||||
};
|
||||
|
||||
use super::{response, ClientType, MapResponse, QContinuation, RustyPipeQuery, YTContext};
|
||||
use super::{response, ClientType, MapResponse, RustyPipeQuery, YTContext};
|
||||
|
||||
#[derive(Debug, Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
|
|
@ -37,6 +36,8 @@ enum ChannelTab {
|
|||
Live,
|
||||
#[serde(rename = "EglwbGF5bGlzdHMgAQ%3D%3D")]
|
||||
Playlists,
|
||||
#[serde(rename = "EgVhYm91dPIGBAoCEgA%3D")]
|
||||
Info,
|
||||
#[serde(rename = "EgZzZWFyY2jyBgQKAloA")]
|
||||
Search,
|
||||
}
|
||||
|
|
@ -125,7 +126,7 @@ impl RustyPipeQuery {
|
|||
let visitor_data = Some(self.get_visitor_data().await?);
|
||||
|
||||
self.continuation(
|
||||
order_ctoken(channel_id.as_ref(), tab, order, &random_target()),
|
||||
order_ctoken(channel_id.as_ref(), tab, order),
|
||||
ContinuationEndpoint::Browse,
|
||||
visitor_data.as_deref(),
|
||||
)
|
||||
|
|
@ -178,17 +179,19 @@ impl RustyPipeQuery {
|
|||
pub async fn channel_info<S: AsRef<str> + Debug>(
|
||||
&self,
|
||||
channel_id: S,
|
||||
) -> Result<ChannelInfo, Error> {
|
||||
) -> Result<Channel<ChannelInfo>, Error> {
|
||||
let channel_id = channel_id.as_ref();
|
||||
let context = self.get_context(ClientType::Desktop, false, None).await;
|
||||
let request_body = QContinuation {
|
||||
let context = self.get_context(ClientType::Desktop, true, None).await;
|
||||
let request_body = QChannel {
|
||||
context,
|
||||
continuation: &channel_info_ctoken(channel_id, &random_target()),
|
||||
browse_id: channel_id,
|
||||
params: ChannelTab::Info,
|
||||
query: None,
|
||||
};
|
||||
|
||||
self.execute_request::<response::ChannelAbout, _, _>(
|
||||
self.execute_request::<response::Channel, _, _>(
|
||||
ClientType::Desktop,
|
||||
"channel_info2",
|
||||
"channel_info",
|
||||
channel_id,
|
||||
"browse",
|
||||
&request_body,
|
||||
|
|
@ -287,64 +290,46 @@ impl MapResponse<Channel<Paginator<PlaylistItem>>> for response::Channel {
|
|||
}
|
||||
}
|
||||
|
||||
impl MapResponse<ChannelInfo> for response::ChannelAbout {
|
||||
impl MapResponse<Channel<ChannelInfo>> for response::Channel {
|
||||
fn map_response(
|
||||
self,
|
||||
_id: &str,
|
||||
id: &str,
|
||||
lang: Language,
|
||||
_deobf: Option<&crate::deobfuscate::DeobfData>,
|
||||
_visitor_data: Option<&str>,
|
||||
) -> Result<MapResult<ChannelInfo>, ExtractionError> {
|
||||
let ep = self
|
||||
.on_response_received_endpoints
|
||||
.into_iter()
|
||||
.next()
|
||||
.ok_or(ExtractionError::InvalidData("no received endpoint".into()))?;
|
||||
let continuations = ep.append_continuation_items_action.continuation_items;
|
||||
let about = continuations
|
||||
.c
|
||||
.into_iter()
|
||||
.next()
|
||||
.ok_or(ExtractionError::InvalidData("no aboutChannel data".into()))?
|
||||
.about_channel_renderer
|
||||
.metadata
|
||||
.about_channel_view_model;
|
||||
let mut warnings = continuations.warnings;
|
||||
vdata: Option<&str>,
|
||||
) -> Result<MapResult<Channel<ChannelInfo>>, ExtractionError> {
|
||||
let content = map_channel_content(id, self.contents, self.alerts)?;
|
||||
let channel_data = map_channel(
|
||||
MapChannelData {
|
||||
header: self.header,
|
||||
metadata: self.metadata,
|
||||
microformat: self.microformat,
|
||||
visitor_data: self
|
||||
.response_context
|
||||
.visitor_data
|
||||
.or_else(|| vdata.map(str::to_owned)),
|
||||
has_shorts: content.has_shorts,
|
||||
has_live: content.has_live,
|
||||
},
|
||||
id,
|
||||
lang,
|
||||
)?;
|
||||
|
||||
let links = about
|
||||
.links
|
||||
.into_iter()
|
||||
.filter_map(|l| {
|
||||
let lv = l.channel_external_link_view_model;
|
||||
if let TextComponent::Web { url, .. } = lv.link {
|
||||
Some((String::from(lv.title), util::sanitize_yt_url(&url)))
|
||||
} else {
|
||||
None
|
||||
let mut mapper = response::YouTubeListMapper::<YouTubeItem>::new(lang);
|
||||
mapper.map_response(content.content);
|
||||
let mut warnings = mapper.warnings;
|
||||
|
||||
let cinfo = mapper.channel_info.unwrap_or_else(|| {
|
||||
warnings.push("no aboutFullMetadata".to_owned());
|
||||
ChannelInfo {
|
||||
create_date: None,
|
||||
view_count: None,
|
||||
links: Vec::new(),
|
||||
}
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
});
|
||||
|
||||
Ok(MapResult {
|
||||
c: ChannelInfo {
|
||||
id: about.channel_id,
|
||||
url: about.canonical_channel_url,
|
||||
description: about.description,
|
||||
subscriber_count: about
|
||||
.subscriber_count_text
|
||||
.and_then(|txt| util::parse_large_numstr_or_warn(&txt, lang, &mut warnings)),
|
||||
video_count: about
|
||||
.video_count_text
|
||||
.and_then(|txt| util::parse_numeric_or_warn(&txt, &mut warnings)),
|
||||
create_date: about.joined_date_text.and_then(|txt| {
|
||||
timeago::parse_textual_date_or_warn(lang, &txt, &mut warnings)
|
||||
.map(OffsetDateTime::date)
|
||||
}),
|
||||
view_count: about
|
||||
.view_count_text
|
||||
.and_then(|txt| util::parse_numeric_or_warn(&txt, &mut warnings)),
|
||||
country: about.country.and_then(|c| util::country_from_name(&c)),
|
||||
links,
|
||||
},
|
||||
c: combine_channel_data(channel_data.c, cinfo),
|
||||
warnings,
|
||||
})
|
||||
}
|
||||
|
|
@ -564,7 +549,18 @@ fn combine_channel_data<T>(channel_data: Channel<()>, content: T) -> Channel<T>
|
|||
}
|
||||
|
||||
/// Get the continuation token to fetch channel videos in the given order
|
||||
fn order_ctoken(
|
||||
fn order_ctoken(channel_id: &str, tab: ChannelVideoTab, order: ChannelOrder) -> String {
|
||||
_order_ctoken(
|
||||
channel_id,
|
||||
tab,
|
||||
order,
|
||||
&format!("\n${}", util::random_uuid()),
|
||||
)
|
||||
}
|
||||
|
||||
/// Get the continuation token to fetch channel videos in the given order
|
||||
/// (fixed targetId for testing)
|
||||
fn _order_ctoken(
|
||||
channel_id: &str,
|
||||
tab: ChannelVideoTab,
|
||||
order: ChannelOrder,
|
||||
|
|
@ -593,32 +589,6 @@ fn order_ctoken(
|
|||
pb.to_base64()
|
||||
}
|
||||
|
||||
/// Get the continuation token to fetch channel
|
||||
fn channel_info_ctoken(channel_id: &str, target_id: &str) -> String {
|
||||
let mut pb_3 = ProtoBuilder::new();
|
||||
pb_3.string(19, target_id);
|
||||
|
||||
let mut pb_110 = ProtoBuilder::new();
|
||||
pb_110.embedded(3, pb_3);
|
||||
|
||||
let mut pbi = ProtoBuilder::new();
|
||||
pbi.embedded(110, pb_110);
|
||||
|
||||
let mut pb_80226972 = ProtoBuilder::new();
|
||||
pb_80226972.string(2, channel_id);
|
||||
pb_80226972.string(3, &pbi.to_base64());
|
||||
|
||||
let mut pb = ProtoBuilder::new();
|
||||
pb.embedded(80_226_972, pb_80226972);
|
||||
|
||||
pb.to_base64()
|
||||
}
|
||||
|
||||
/// Create a random UUId to build continuation tokens
|
||||
fn random_target() -> String {
|
||||
format!("\n${}", util::random_uuid())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::{fs::File, io::BufReader};
|
||||
|
|
@ -634,7 +604,7 @@ mod tests {
|
|||
util::tests::TESTFILES,
|
||||
};
|
||||
|
||||
use super::{channel_info_ctoken, order_ctoken};
|
||||
use super::_order_ctoken;
|
||||
|
||||
#[rstest]
|
||||
#[case::base("videos_base", "UC2DjFE7Xf11URZqWBigcVOQ")]
|
||||
|
|
@ -698,10 +668,10 @@ mod tests {
|
|||
let json_path = path!(*TESTFILES / "channel" / "channel_info.json");
|
||||
let json_file = File::open(json_path).unwrap();
|
||||
|
||||
let channel: response::ChannelAbout =
|
||||
let channel: response::Channel =
|
||||
serde_json::from_reader(BufReader::new(json_file)).unwrap();
|
||||
let map_res: MapResult<ChannelInfo> = channel
|
||||
.map_response("UC2DjFE7Xf11U-RZqWBigcVOQ", Language::En, None, None)
|
||||
let map_res: MapResult<Channel<ChannelInfo>> = channel
|
||||
.map_response("UC2DjFE7Xf11URZqWBigcVOQ", Language::En, None, None)
|
||||
.unwrap();
|
||||
|
||||
assert!(
|
||||
|
|
@ -713,10 +683,10 @@ mod tests {
|
|||
}
|
||||
|
||||
#[test]
|
||||
fn t_order_ctoken() {
|
||||
fn order_ctoken() {
|
||||
let channel_id = "UCXuqSBlHAE6Xw-yeJA0Tunw";
|
||||
|
||||
let videos_popular_token = order_ctoken(
|
||||
let videos_popular_token = _order_ctoken(
|
||||
channel_id,
|
||||
ChannelVideoTab::Videos,
|
||||
ChannelOrder::Popular,
|
||||
|
|
@ -724,7 +694,7 @@ mod tests {
|
|||
);
|
||||
assert_eq!(videos_popular_token, "4qmFsgJkEhhVQ1h1cVNCbEhBRTZYdy15ZUpBMFR1bncaSDhnWXVHaXg2S2hJbUNpUTJORFl4WkRkak9DMHdNREF3TFRJd05EQXRPRGRoWVMwd09EbGxNRGd5TjJVME1qQVlBZyUzRCUzRA%3D%3D");
|
||||
|
||||
let shorts_popular_token = order_ctoken(
|
||||
let shorts_popular_token = _order_ctoken(
|
||||
channel_id,
|
||||
ChannelVideoTab::Shorts,
|
||||
ChannelOrder::Popular,
|
||||
|
|
@ -732,7 +702,7 @@ mod tests {
|
|||
);
|
||||
assert_eq!(shorts_popular_token, "4qmFsgJkEhhVQ1h1cVNCbEhBRTZYdy15ZUpBMFR1bncaSDhnWXVHaXhTS2hJbUNpUTJORFkzT1dabVlpMHdNREF3TFRJMllqTXRZVEZpWkMwMU9ESTBNamxrTW1NM09UUVlBZyUzRCUzRA%3D%3D");
|
||||
|
||||
let live_popular_token = order_ctoken(
|
||||
let live_popular_token = _order_ctoken(
|
||||
channel_id,
|
||||
ChannelVideoTab::Live,
|
||||
ChannelOrder::Popular,
|
||||
|
|
@ -740,12 +710,4 @@ mod tests {
|
|||
);
|
||||
assert_eq!(live_popular_token, "4qmFsgJkEhhVQ1h1cVNCbEhBRTZYdy15ZUpBMFR1bncaSDhnWXVHaXh5S2hJbUNpUTJORFk1TXpBMk9TMHdNREF3TFRKaE1XVXRPR00zWkMwMU9ESTBNamxpWkRWaVlUZ1lBZyUzRCUzRA%3D%3D");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn t_channel_info_ctoken() {
|
||||
let channel_id = "UCh8gHdtzO2tXd593_bjErWg";
|
||||
|
||||
let token = channel_info_ctoken(channel_id, "\n$655b339a-0000-20b9-92dc-582429d254b4");
|
||||
assert_eq!(token, "4qmFsgJgEhhVQ2g4Z0hkdHpPMnRYZDU5M19iakVyV2caRDhnWXJHaW1hQVNZS0pEWTFOV0l6TXpsaExUQXdNREF0TWpCaU9TMDVNbVJqTFRVNE1qUXlPV1F5TlRSaU5BJTNEJTNE");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ use crate::{
|
|||
error::{Error, ExtractionError},
|
||||
model::ChannelRss,
|
||||
report::{Report, RustyPipeInfo},
|
||||
util,
|
||||
};
|
||||
|
||||
use super::{response, RustyPipeQuery};
|
||||
|
|
@ -37,11 +36,8 @@ impl RustyPipeQuery {
|
|||
_ => e,
|
||||
})?;
|
||||
|
||||
match quick_xml::de::from_str::<response::ChannelRss>(&xml)
|
||||
.map_err(|e| ExtractionError::InvalidData(e.to_string().into()))
|
||||
.and_then(|feed| feed.map_response(channel_id))
|
||||
{
|
||||
Ok(res) => Ok(res),
|
||||
match quick_xml::de::from_str::<response::ChannelRss>(&xml) {
|
||||
Ok(feed) => Ok(feed.into()),
|
||||
Err(e) => {
|
||||
if let Some(reporter) = &self.client.inner.reporter {
|
||||
let report = Report {
|
||||
|
|
@ -63,69 +59,13 @@ impl RustyPipeQuery {
|
|||
|
||||
reporter.report(&report);
|
||||
}
|
||||
Err(Error::Extraction(e))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl response::ChannelRss {
|
||||
fn map_response(self, id: &str) -> Result<ChannelRss, ExtractionError> {
|
||||
let channel_id = if self.channel_id.is_empty() {
|
||||
self.entry
|
||||
.iter()
|
||||
.find_map(|entry| {
|
||||
Some(entry.channel_id.as_str())
|
||||
.filter(|id| id.is_empty())
|
||||
.map(str::to_owned)
|
||||
})
|
||||
.or_else(|| {
|
||||
self.author
|
||||
.uri
|
||||
.strip_prefix("https://www.youtube.com/channel/")
|
||||
.and_then(|id| {
|
||||
if util::CHANNEL_ID_REGEX.is_match(id) {
|
||||
Some(id.to_owned())
|
||||
} else {
|
||||
None
|
||||
Err(
|
||||
ExtractionError::InvalidData(format!("could not deserialize xml: {e}").into())
|
||||
.into(),
|
||||
)
|
||||
}
|
||||
})
|
||||
})
|
||||
.ok_or(ExtractionError::InvalidData(
|
||||
"could not get channel id".into(),
|
||||
))?
|
||||
} else if self.channel_id.len() == 22 {
|
||||
// As of November 2023, YouTube seems to output channel IDs without the UC prefix
|
||||
format!("UC{}", self.channel_id)
|
||||
} else {
|
||||
self.channel_id
|
||||
};
|
||||
|
||||
if channel_id != id {
|
||||
return Err(ExtractionError::WrongResult(format!(
|
||||
"got wrong channel id {channel_id}, expected {id}",
|
||||
)));
|
||||
}
|
||||
|
||||
Ok(ChannelRss {
|
||||
id: channel_id,
|
||||
name: self.title,
|
||||
videos: self
|
||||
.entry
|
||||
.into_iter()
|
||||
.map(|item| crate::model::ChannelRssVideo {
|
||||
id: item.video_id,
|
||||
name: item.title,
|
||||
description: item.media_group.description,
|
||||
thumbnail: item.media_group.thumbnail.into(),
|
||||
publish_date: item.published,
|
||||
update_date: item.updated,
|
||||
view_count: item.media_group.community.statistics.views,
|
||||
like_count: item.media_group.community.rating.count,
|
||||
})
|
||||
.collect(),
|
||||
create_date: self.create_date,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -133,24 +73,24 @@ impl response::ChannelRss {
|
|||
mod tests {
|
||||
use std::{fs::File, io::BufReader};
|
||||
|
||||
use crate::{client::response, util::tests::TESTFILES};
|
||||
use crate::{client::response, model::ChannelRss, util::tests::TESTFILES};
|
||||
|
||||
use path_macro::path;
|
||||
use rstest::rstest;
|
||||
|
||||
#[rstest]
|
||||
#[case::base("base", "UCHnyfMqiRRG1u-2MsSQLbXA")]
|
||||
#[case::no_likes("no_likes", "UCdfxp4cUWsWryZOy-o427dw")]
|
||||
#[case::no_channel_id("no_channel_id", "UCHnyfMqiRRG1u-2MsSQLbXA")]
|
||||
#[case::trimmed_channel_id("trimmed_channel_id", "UCHnyfMqiRRG1u-2MsSQLbXA")]
|
||||
fn map_channel_rss(#[case] name: &str, #[case] id: &str) {
|
||||
#[case::base("base")]
|
||||
#[case::no_likes("no_likes")]
|
||||
#[case::no_channel_id("no_channel_id")]
|
||||
fn map_channel_rss(#[case] name: &str) {
|
||||
let xml_path = path!(*TESTFILES / "channel_rss" / format!("{}.xml", name));
|
||||
let xml_file = File::open(xml_path).unwrap();
|
||||
|
||||
let feed: response::ChannelRss =
|
||||
quick_xml::de::from_reader(BufReader::new(xml_file)).unwrap();
|
||||
|
||||
let map_res = feed.map_response(id).unwrap();
|
||||
let map_res: ChannelRss = feed.into();
|
||||
|
||||
insta::assert_ron_snapshot!(format!("map_channel_rss_{}", name), map_res);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -235,6 +235,7 @@ fn map_artist_page(
|
|||
}
|
||||
}
|
||||
|
||||
mapper.check_unknown()?;
|
||||
let mut mapped = mapper.group_items();
|
||||
|
||||
static WIKIPEDIA_REGEX: Lazy<Regex> =
|
||||
|
|
@ -331,6 +332,7 @@ impl MapResponse<Vec<AlbumItem>> for response::MusicArtistAlbums {
|
|||
mapper.map_response(grid.grid_renderer.items);
|
||||
}
|
||||
|
||||
mapper.check_unknown()?;
|
||||
let mapped = mapper.group_items();
|
||||
|
||||
Ok(MapResult {
|
||||
|
|
|
|||
|
|
@ -98,7 +98,6 @@ impl MapResponse<MusicCharts> for response::MusicCharts {
|
|||
h.music_carousel_shelf_basic_header_renderer
|
||||
.more_content_button
|
||||
.and_then(|btn| btn.button_renderer.navigation_endpoint.music_page())
|
||||
.map(|mp| (mp.typ, mp.id))
|
||||
}) {
|
||||
Some((MusicPageType::Playlist, id)) => {
|
||||
// Top music videos (first shelf with associated playlist)
|
||||
|
|
@ -121,6 +120,10 @@ impl MapResponse<MusicCharts> for response::MusicCharts {
|
|||
response::music_charts::ItemSection::None => {}
|
||||
});
|
||||
|
||||
mapper_top.check_unknown()?;
|
||||
mapper_trending.check_unknown()?;
|
||||
mapper_other.check_unknown()?;
|
||||
|
||||
let mapped_top = mapper_top.conv_items::<TrackItem>();
|
||||
let mut mapped_trending = mapper_trending.conv_items::<TrackItem>();
|
||||
let mut mapped_other = mapper_other.group_items();
|
||||
|
|
|
|||
|
|
@ -387,6 +387,9 @@ impl MapResponse<MusicRelated> for response::MusicRelated {
|
|||
_ => {}
|
||||
});
|
||||
|
||||
mapper.check_unknown()?;
|
||||
mapper_tracks.check_unknown()?;
|
||||
|
||||
let mapped_tracks = mapper_tracks.conv_items();
|
||||
let mut mapped = mapper.group_items();
|
||||
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@ impl<T: FromYtItem> MapResponse<Vec<T>> for response::MusicNew {
|
|||
|
||||
let mut mapper = MusicListMapper::new(lang);
|
||||
mapper.map_response(items);
|
||||
mapper.check_unknown()?;
|
||||
|
||||
Ok(mapper.conv_items())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -174,6 +174,7 @@ impl MapResponse<MusicPlaylist> for response::MusicPlaylist {
|
|||
|
||||
let mut mapper = MusicListMapper::new(lang);
|
||||
mapper.map_response(shelf.contents);
|
||||
mapper.check_unknown()?;
|
||||
let map_res = mapper.conv_items();
|
||||
|
||||
let ctoken = shelf
|
||||
|
|
|
|||
|
|
@ -266,6 +266,7 @@ impl MapResponse<MusicSearchResult> for response::MusicSearch {
|
|||
response::music_search::ItemSection::None => {}
|
||||
});
|
||||
|
||||
mapper.check_unknown()?;
|
||||
let map_res = mapper.group_items();
|
||||
|
||||
Ok(MapResult {
|
||||
|
|
@ -324,6 +325,7 @@ impl<T: FromYtItem> MapResponse<MusicSearchFiltered<T>> for response::MusicSearc
|
|||
response::music_search::ItemSection::None => {}
|
||||
});
|
||||
|
||||
mapper.check_unknown()?;
|
||||
let map_res = mapper.conv_items();
|
||||
|
||||
Ok(MapResult {
|
||||
|
|
@ -369,6 +371,7 @@ impl MapResponse<MusicSearchSuggestion> for response::MusicSearchSuggestion {
|
|||
}
|
||||
}
|
||||
|
||||
mapper.check_unknown()?;
|
||||
let map_res = mapper.conv_items();
|
||||
|
||||
Ok(MapResult {
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@ use serde::Deserialize;
|
|||
use serde_with::{rust::deserialize_ignore_any, serde_as, DefaultOnError, VecSkipError};
|
||||
|
||||
use super::{
|
||||
video_item::YouTubeListRenderer, Alert, ChannelBadge, ContentsRenderer, ContinuationActionWrap,
|
||||
ResponseContext, Thumbnails, TwoColumnBrowseResults,
|
||||
video_item::YouTubeListRenderer, Alert, ChannelBadge, ContentsRenderer, ResponseContext,
|
||||
Thumbnails, TwoColumnBrowseResults,
|
||||
};
|
||||
use crate::serializer::text::{AttributedText, Text, TextComponent};
|
||||
use crate::serializer::text::Text;
|
||||
|
||||
#[serde_as]
|
||||
#[derive(Debug, Deserialize)]
|
||||
|
|
@ -145,66 +145,3 @@ pub(crate) struct MicroformatDataRenderer {
|
|||
#[serde(default)]
|
||||
pub tags: Vec<String>,
|
||||
}
|
||||
|
||||
#[serde_as]
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct ChannelAbout {
|
||||
#[serde_as(as = "VecSkipError<_>")]
|
||||
pub on_response_received_endpoints: Vec<ContinuationActionWrap<AboutChannelRendererWrap>>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct AboutChannelRendererWrap {
|
||||
pub about_channel_renderer: AboutChannelRenderer,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct AboutChannelRenderer {
|
||||
pub metadata: ChannelMetadata,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct ChannelMetadata {
|
||||
pub about_channel_view_model: ChannelMetadataView,
|
||||
}
|
||||
|
||||
#[serde_as]
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct ChannelMetadataView {
|
||||
pub channel_id: String,
|
||||
pub canonical_channel_url: String,
|
||||
pub country: Option<String>,
|
||||
#[serde(default)]
|
||||
pub description: String,
|
||||
#[serde_as(as = "Option<Text>")]
|
||||
pub joined_date_text: Option<String>,
|
||||
#[serde_as(as = "Option<Text>")]
|
||||
pub subscriber_count_text: Option<String>,
|
||||
#[serde_as(as = "Option<Text>")]
|
||||
pub video_count_text: Option<String>,
|
||||
#[serde_as(as = "Option<Text>")]
|
||||
pub view_count_text: Option<String>,
|
||||
#[serde(default)]
|
||||
pub links: Vec<ExternalLink>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct ExternalLink {
|
||||
pub channel_external_link_view_model: ExternalLinkInner,
|
||||
}
|
||||
|
||||
#[serde_as]
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct ExternalLinkInner {
|
||||
#[serde_as(as = "AttributedText")]
|
||||
pub title: TextComponent,
|
||||
#[serde_as(as = "AttributedText")]
|
||||
pub link: TextComponent,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
use serde::Deserialize;
|
||||
use time::OffsetDateTime;
|
||||
|
||||
use crate::util;
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub(crate) struct ChannelRss {
|
||||
#[serde(rename = "channelId")]
|
||||
|
|
@ -78,3 +80,52 @@ impl From<Thumbnail> for crate::model::Thumbnail {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<ChannelRss> for crate::model::ChannelRss {
|
||||
fn from(feed: ChannelRss) -> Self {
|
||||
let id = if feed.channel_id.is_empty() {
|
||||
feed.entry
|
||||
.iter()
|
||||
.find_map(|entry| {
|
||||
Some(entry.channel_id.as_str())
|
||||
.filter(|id| id.is_empty())
|
||||
.map(str::to_owned)
|
||||
})
|
||||
.or_else(|| {
|
||||
feed.author
|
||||
.uri
|
||||
.strip_prefix("https://www.youtube.com/channel/")
|
||||
.and_then(|id| {
|
||||
if util::CHANNEL_ID_REGEX.is_match(id) {
|
||||
Some(id.to_owned())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
})
|
||||
.unwrap_or_default()
|
||||
} else {
|
||||
feed.channel_id
|
||||
};
|
||||
|
||||
Self {
|
||||
id,
|
||||
name: feed.title,
|
||||
videos: feed
|
||||
.entry
|
||||
.into_iter()
|
||||
.map(|item| crate::model::ChannelRssVideo {
|
||||
id: item.video_id,
|
||||
name: item.title,
|
||||
description: item.media_group.description,
|
||||
thumbnail: item.media_group.thumbnail.into(),
|
||||
publish_date: item.published,
|
||||
update_date: item.updated,
|
||||
view_count: item.media_group.community.statistics.views,
|
||||
like_count: item.media_group.community.rating.count,
|
||||
})
|
||||
.collect(),
|
||||
create_date: feed.create_date,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ pub(crate) mod video_details;
|
|||
pub(crate) mod video_item;
|
||||
|
||||
pub(crate) use channel::Channel;
|
||||
pub(crate) use channel::ChannelAbout;
|
||||
pub(crate) use music_artist::MusicArtist;
|
||||
pub(crate) use music_artist::MusicArtistAlbums;
|
||||
pub(crate) use music_charts::MusicCharts;
|
||||
|
|
@ -209,7 +208,7 @@ pub(crate) struct Continuation {
|
|||
alias = "onResponseReceivedEndpoints"
|
||||
)]
|
||||
#[serde_as(as = "Option<VecSkipError<_>>")]
|
||||
pub on_response_received_actions: Option<Vec<ContinuationActionWrap<YouTubeListItem>>>,
|
||||
pub on_response_received_actions: Option<Vec<ContinuationActionWrap>>,
|
||||
/// Used for channel video rich grid renderer
|
||||
///
|
||||
/// A/B test seen on 19.10.2022
|
||||
|
|
@ -218,15 +217,15 @@ pub(crate) struct Continuation {
|
|||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct ContinuationActionWrap<T> {
|
||||
pub(crate) struct ContinuationActionWrap {
|
||||
#[serde(alias = "reloadContinuationItemsCommand")]
|
||||
pub append_continuation_items_action: ContinuationAction<T>,
|
||||
pub append_continuation_items_action: ContinuationAction,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct ContinuationAction<T> {
|
||||
pub continuation_items: MapResult<Vec<T>>,
|
||||
pub(crate) struct ContinuationAction {
|
||||
pub continuation_items: MapResult<Vec<YouTubeListItem>>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
|
|
|
|||
|
|
@ -2,13 +2,14 @@ use serde::Deserialize;
|
|||
use serde_with::{rust::deserialize_ignore_any, serde_as, DefaultOnError, VecSkipError};
|
||||
|
||||
use crate::{
|
||||
error::ExtractionError,
|
||||
model::{
|
||||
self, traits::FromYtItem, AlbumId, AlbumItem, AlbumType, ArtistId, ArtistItem, ChannelId,
|
||||
MusicItem, MusicItemType, MusicPlaylistItem, TrackItem,
|
||||
},
|
||||
param::Language,
|
||||
serializer::{
|
||||
text::{Text, TextComponent, TextComponents},
|
||||
text::{Text, TextComponents},
|
||||
MapResult,
|
||||
},
|
||||
util::{self, dictionary},
|
||||
|
|
@ -16,7 +17,7 @@ use crate::{
|
|||
|
||||
use super::{
|
||||
url_endpoint::{
|
||||
BrowseEndpointWrap, MusicPage, MusicPageType, MusicVideoType, NavigationEndpoint, PageType,
|
||||
BrowseEndpointWrap, MusicPageType, MusicVideoType, NavigationEndpoint, PageType,
|
||||
},
|
||||
ContentsRenderer, MusicContinuationData, Thumbnails, ThumbnailsWrap,
|
||||
};
|
||||
|
|
@ -433,6 +434,8 @@ pub(crate) struct MusicListMapper {
|
|||
search_suggestion: bool,
|
||||
items: Vec<MusicItem>,
|
||||
warnings: Vec<String>,
|
||||
/// True if unknown items were mapped
|
||||
has_unknown: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
|
|
@ -453,6 +456,7 @@ impl MusicListMapper {
|
|||
search_suggestion: false,
|
||||
items: Vec::new(),
|
||||
warnings: Vec::new(),
|
||||
has_unknown: false,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -465,6 +469,7 @@ impl MusicListMapper {
|
|||
search_suggestion: true,
|
||||
items: Vec::new(),
|
||||
warnings: Vec::new(),
|
||||
has_unknown: false,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -478,6 +483,7 @@ impl MusicListMapper {
|
|||
search_suggestion: false,
|
||||
items: Vec::new(),
|
||||
warnings: Vec::new(),
|
||||
has_unknown: false,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -491,6 +497,7 @@ impl MusicListMapper {
|
|||
search_suggestion: false,
|
||||
items: Vec::new(),
|
||||
warnings: Vec::new(),
|
||||
has_unknown: false,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -538,44 +545,55 @@ impl MusicListMapper {
|
|||
.thumbnails
|
||||
.first();
|
||||
|
||||
let music_page = item
|
||||
let pt_id = item
|
||||
.navigation_endpoint
|
||||
.and_then(NavigationEndpoint::music_page)
|
||||
.or_else(|| {
|
||||
c1.and_then(|c1| {
|
||||
c1.renderer
|
||||
.text
|
||||
.0
|
||||
.into_iter()
|
||||
.next()
|
||||
.and_then(TextComponent::music_page)
|
||||
c1.renderer.text.0.into_iter().next().and_then(|t| match t {
|
||||
crate::serializer::text::TextComponent::Video {
|
||||
video_id, vtype, ..
|
||||
} => Some((MusicPageType::Track { vtype }, video_id)),
|
||||
crate::serializer::text::TextComponent::Browse {
|
||||
page_type,
|
||||
browse_id,
|
||||
..
|
||||
} => Some((page_type.into(), browse_id)),
|
||||
_ => None,
|
||||
})
|
||||
})
|
||||
})
|
||||
.or_else(|| {
|
||||
item.playlist_item_data.map(|d| MusicPage {
|
||||
id: d.video_id,
|
||||
typ: MusicPageType::Track {
|
||||
item.playlist_item_data.map(|d| {
|
||||
(
|
||||
MusicPageType::Track {
|
||||
vtype: MusicVideoType::from_is_video(
|
||||
self.album.is_none()
|
||||
&& !first_tn.map(|tn| tn.height == tn.width).unwrap_or_default(),
|
||||
&& !first_tn
|
||||
.map(|tn| tn.height == tn.width)
|
||||
.unwrap_or_default(),
|
||||
),
|
||||
},
|
||||
d.video_id,
|
||||
)
|
||||
})
|
||||
})
|
||||
.or_else(|| {
|
||||
first_tn.and_then(|tn| {
|
||||
util::video_id_from_thumbnail_url(&tn.url).map(|id| MusicPage {
|
||||
id,
|
||||
typ: MusicPageType::Track {
|
||||
util::video_id_from_thumbnail_url(&tn.url).map(|id| {
|
||||
(
|
||||
MusicPageType::Track {
|
||||
vtype: MusicVideoType::from_is_video(
|
||||
self.album.is_none() && tn.width != tn.height,
|
||||
),
|
||||
},
|
||||
id,
|
||||
)
|
||||
})
|
||||
})
|
||||
});
|
||||
|
||||
match music_page.map(|mp| (mp.typ, mp.id)) {
|
||||
match pt_id {
|
||||
// Track
|
||||
Some((MusicPageType::Track { vtype }, id)) => {
|
||||
let title = title.ok_or_else(|| format!("track {id}: could not get title"))?;
|
||||
|
|
@ -834,6 +852,10 @@ impl MusicListMapper {
|
|||
}
|
||||
// Tracks were already handled above
|
||||
MusicPageType::Track { .. } => unreachable!(),
|
||||
MusicPageType::Unknown => {
|
||||
self.has_unknown = true;
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
}
|
||||
None => {
|
||||
|
|
@ -853,12 +875,12 @@ impl MusicListMapper {
|
|||
let subtitle_p2 = subtitle_parts.next();
|
||||
|
||||
match item.navigation_endpoint.music_page() {
|
||||
Some(music_page) => match music_page.typ {
|
||||
Some((page_type, id)) => match page_type {
|
||||
MusicPageType::Track { vtype } => {
|
||||
let (artists, by_va) = map_artists(subtitle_p1);
|
||||
|
||||
self.items.push(MusicItem::Track(TrackItem {
|
||||
id: music_page.id,
|
||||
id,
|
||||
name: item.title,
|
||||
duration: None,
|
||||
cover: item.thumbnail_renderer.into(),
|
||||
|
|
@ -888,7 +910,7 @@ impl MusicListMapper {
|
|||
});
|
||||
|
||||
self.items.push(MusicItem::Artist(ArtistItem {
|
||||
id: music_page.id,
|
||||
id,
|
||||
name: item.title,
|
||||
avatar: item.thumbnail_renderer.into(),
|
||||
subscriber_count,
|
||||
|
|
@ -925,15 +947,12 @@ impl MusicListMapper {
|
|||
(Vec::new(), true)
|
||||
}
|
||||
_ => {
|
||||
return Err(format!(
|
||||
"could not parse subtitle of album {}",
|
||||
music_page.id
|
||||
));
|
||||
return Err(format!("could not parse subtitle of album {id}"));
|
||||
}
|
||||
};
|
||||
|
||||
self.items.push(MusicItem::Album(AlbumItem {
|
||||
id: music_page.id,
|
||||
id,
|
||||
name: item.title,
|
||||
cover: item.thumbnail_renderer.into(),
|
||||
artist_id: artists.first().and_then(|a| a.id.clone()),
|
||||
|
|
@ -955,7 +974,7 @@ impl MusicListMapper {
|
|||
.and_then(|p| p.0.into_iter().find_map(|c| ChannelId::try_from(c).ok()));
|
||||
|
||||
self.items.push(MusicItem::Playlist(MusicPlaylistItem {
|
||||
id: music_page.id,
|
||||
id,
|
||||
name: item.title,
|
||||
thumbnail: item.thumbnail_renderer.into(),
|
||||
channel,
|
||||
|
|
@ -965,6 +984,10 @@ impl MusicListMapper {
|
|||
Ok(Some(MusicItemType::Playlist))
|
||||
}
|
||||
MusicPageType::None => Ok(None),
|
||||
MusicPageType::Unknown => {
|
||||
self.has_unknown = true;
|
||||
Ok(None)
|
||||
}
|
||||
},
|
||||
None => Err("could not determine item type".to_owned()),
|
||||
}
|
||||
|
|
@ -986,7 +1009,7 @@ impl MusicListMapper {
|
|||
let subtitle_p4 = subtitle_parts.next();
|
||||
|
||||
let item_type = match card.on_tap.music_page() {
|
||||
Some(music_page) => match music_page.typ {
|
||||
Some((page_type, id)) => match page_type {
|
||||
MusicPageType::Artist => {
|
||||
let subscriber_count = subtitle_p2.and_then(|p| {
|
||||
util::parse_large_numstr_or_warn(
|
||||
|
|
@ -997,7 +1020,7 @@ impl MusicListMapper {
|
|||
});
|
||||
|
||||
self.items.push(MusicItem::Artist(ArtistItem {
|
||||
id: music_page.id,
|
||||
id,
|
||||
name: card.title,
|
||||
avatar: card.thumbnail.into(),
|
||||
subscriber_count,
|
||||
|
|
@ -1011,7 +1034,7 @@ impl MusicListMapper {
|
|||
.unwrap_or_default();
|
||||
|
||||
self.items.push(MusicItem::Album(AlbumItem {
|
||||
id: music_page.id,
|
||||
id,
|
||||
name: card.title,
|
||||
cover: card.thumbnail.into(),
|
||||
artist_id: artists.first().and_then(|a| a.id.clone()),
|
||||
|
|
@ -1027,7 +1050,7 @@ impl MusicListMapper {
|
|||
let (artists, by_va) = map_artists(subtitle_p3);
|
||||
|
||||
self.items.push(MusicItem::Track(TrackItem {
|
||||
id: music_page.id,
|
||||
id,
|
||||
name: card.title,
|
||||
duration: None,
|
||||
cover: card.thumbnail.into(),
|
||||
|
|
@ -1064,7 +1087,7 @@ impl MusicListMapper {
|
|||
};
|
||||
|
||||
self.items.push(MusicItem::Track(TrackItem {
|
||||
id: music_page.id,
|
||||
id,
|
||||
name: card.title,
|
||||
duration,
|
||||
cover: card.thumbnail.into(),
|
||||
|
|
@ -1090,7 +1113,7 @@ impl MusicListMapper {
|
|||
subtitle_p3.and_then(|p| util::parse_numeric(p.first_str()).ok());
|
||||
|
||||
self.items.push(MusicItem::Playlist(MusicPlaylistItem {
|
||||
id: music_page.id,
|
||||
id,
|
||||
name: card.title,
|
||||
thumbnail: card.thumbnail.into(),
|
||||
channel,
|
||||
|
|
@ -1100,6 +1123,10 @@ impl MusicListMapper {
|
|||
Some(MusicItemType::Playlist)
|
||||
}
|
||||
MusicPageType::None => None,
|
||||
MusicPageType::Unknown => {
|
||||
self.has_unknown = true;
|
||||
None
|
||||
}
|
||||
},
|
||||
None => {
|
||||
self.warnings
|
||||
|
|
@ -1174,6 +1201,20 @@ impl MusicListMapper {
|
|||
warnings: self.warnings,
|
||||
}
|
||||
}
|
||||
|
||||
/// Sometimes the YT Music API returns responses containing unknown items.
|
||||
///
|
||||
/// In this case, the response data is likely missing some fields, which leads to
|
||||
/// parsing errors and wrong data being extracted.
|
||||
///
|
||||
/// Therefore it is safest to discard such responses and retry the request.
|
||||
pub fn check_unknown(&self) -> Result<(), ExtractionError> {
|
||||
if self.has_unknown {
|
||||
Err(ExtractionError::InvalidData("unknown YTM items".into()))
|
||||
} else {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Map TextComponents containing artist names to a list of artists and a 'Various Artists' flag
|
||||
|
|
|
|||
|
|
@ -185,10 +185,6 @@ pub(crate) enum PageType {
|
|||
Channel,
|
||||
#[serde(rename = "MUSIC_PAGE_TYPE_PLAYLIST", alias = "WEB_PAGE_TYPE_PLAYLIST")]
|
||||
Playlist,
|
||||
#[serde(rename = "MUSIC_PAGE_TYPE_PODCAST_SHOW_DETAIL_PAGE")]
|
||||
Podcast,
|
||||
#[serde(rename = "MUSIC_PAGE_TYPE_NON_MUSIC_AUDIO_TRACK_PAGE")]
|
||||
Episode,
|
||||
#[default]
|
||||
Unknown,
|
||||
}
|
||||
|
|
@ -199,13 +195,6 @@ impl PageType {
|
|||
PageType::Artist | PageType::Channel => Some(UrlTarget::Channel { id }),
|
||||
PageType::Album => Some(UrlTarget::Album { id }),
|
||||
PageType::Playlist => Some(UrlTarget::Playlist { id }),
|
||||
PageType::Podcast => Some(UrlTarget::Playlist {
|
||||
id: util::strip_prefix(&id, util::PODCAST_PLAYLIST_PREFIX),
|
||||
}),
|
||||
PageType::Episode => Some(UrlTarget::Video {
|
||||
id: util::strip_prefix(&id, util::PODCAST_EPISODE_PREFIX),
|
||||
start_time: 0,
|
||||
}),
|
||||
PageType::Unknown => None,
|
||||
}
|
||||
}
|
||||
|
|
@ -217,6 +206,7 @@ pub(crate) enum MusicPageType {
|
|||
Album,
|
||||
Playlist,
|
||||
Track { vtype: MusicVideoType },
|
||||
Unknown,
|
||||
None,
|
||||
}
|
||||
|
||||
|
|
@ -225,40 +215,16 @@ impl From<PageType> for MusicPageType {
|
|||
match t {
|
||||
PageType::Artist => MusicPageType::Artist,
|
||||
PageType::Album => MusicPageType::Album,
|
||||
PageType::Playlist | PageType::Podcast => MusicPageType::Playlist,
|
||||
PageType::Channel | PageType::Unknown => MusicPageType::None,
|
||||
PageType::Episode => MusicPageType::Track {
|
||||
vtype: MusicVideoType::Episode,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) struct MusicPage {
|
||||
pub id: String,
|
||||
pub typ: MusicPageType,
|
||||
}
|
||||
|
||||
impl MusicPage {
|
||||
/// Create a new MusicPage object, applying the required ID fixes when
|
||||
/// mapping a browse link
|
||||
pub fn from_browse(mut id: String, typ: PageType) -> Self {
|
||||
if typ == PageType::Podcast {
|
||||
id = util::strip_prefix(&id, util::PODCAST_PLAYLIST_PREFIX);
|
||||
} else if typ == PageType::Episode && id.len() == 15 {
|
||||
id = util::strip_prefix(&id, util::PODCAST_EPISODE_PREFIX);
|
||||
}
|
||||
|
||||
Self {
|
||||
id,
|
||||
typ: typ.into(),
|
||||
PageType::Playlist => MusicPageType::Playlist,
|
||||
PageType::Channel => MusicPageType::None,
|
||||
PageType::Unknown => MusicPageType::Unknown,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl NavigationEndpoint {
|
||||
/// Get the YouTube Music page and id from a browse/watch endpoint
|
||||
pub(crate) fn music_page(self) -> Option<MusicPage> {
|
||||
pub(crate) fn music_page(self) -> Option<(MusicPageType, String)> {
|
||||
match self {
|
||||
NavigationEndpoint::Watch { watch_endpoint } => {
|
||||
if watch_endpoint
|
||||
|
|
@ -267,20 +233,17 @@ impl NavigationEndpoint {
|
|||
.unwrap_or_default()
|
||||
{
|
||||
// Genre radios (e.g. "pop radio") will be skipped
|
||||
Some(MusicPage {
|
||||
id: watch_endpoint.video_id,
|
||||
typ: MusicPageType::None,
|
||||
})
|
||||
Some((MusicPageType::None, watch_endpoint.video_id))
|
||||
} else {
|
||||
Some(MusicPage {
|
||||
id: watch_endpoint.video_id,
|
||||
typ: MusicPageType::Track {
|
||||
Some((
|
||||
MusicPageType::Track {
|
||||
vtype: watch_endpoint
|
||||
.watch_endpoint_music_supported_configs
|
||||
.watch_endpoint_music_config
|
||||
.music_video_type,
|
||||
},
|
||||
})
|
||||
watch_endpoint.video_id,
|
||||
))
|
||||
}
|
||||
}
|
||||
NavigationEndpoint::Browse {
|
||||
|
|
@ -288,9 +251,9 @@ impl NavigationEndpoint {
|
|||
} => browse_endpoint
|
||||
.browse_endpoint_context_supported_configs
|
||||
.map(|config| {
|
||||
MusicPage::from_browse(
|
||||
(
|
||||
config.browse_endpoint_context_music_config.page_type.into(),
|
||||
browse_endpoint.browse_id,
|
||||
config.browse_endpoint_context_music_config.page_type,
|
||||
)
|
||||
}),
|
||||
NavigationEndpoint::Url { .. } => None,
|
||||
|
|
@ -317,4 +280,14 @@ impl NavigationEndpoint {
|
|||
None
|
||||
}
|
||||
}
|
||||
|
||||
/// Get the sanitized URL from a url endpoint
|
||||
pub(crate) fn url(&self) -> Option<String> {
|
||||
match self {
|
||||
NavigationEndpoint::Url { url_endpoint } => {
|
||||
Some(util::sanitize_yt_url(&url_endpoint.url))
|
||||
}
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@ use serde_with::{
|
|||
};
|
||||
use time::OffsetDateTime;
|
||||
|
||||
use super::{ChannelBadge, ContinuationEndpoint, Thumbnails};
|
||||
use super::{url_endpoint::NavigationEndpoint, ChannelBadge, ContinuationEndpoint, Thumbnails};
|
||||
use crate::{
|
||||
model::{
|
||||
Channel, ChannelId, ChannelItem, ChannelTag, PlaylistItem, Verification, VideoItem,
|
||||
YouTubeItem,
|
||||
Channel, ChannelId, ChannelInfo, ChannelItem, ChannelTag, PlaylistItem, Verification,
|
||||
VideoItem, YouTubeItem,
|
||||
},
|
||||
param::Language,
|
||||
serializer::{
|
||||
text::{AccessibilityText, Text, TextComponent},
|
||||
text::{AccessibilityText, AttributedText, Text, TextComponent},
|
||||
MapResult,
|
||||
},
|
||||
util::{self, timeago, TryRemove},
|
||||
|
|
@ -48,6 +48,9 @@ pub(crate) enum YouTubeListItem {
|
|||
corrected_query: String,
|
||||
},
|
||||
|
||||
/// Channel metadata (about tab)
|
||||
ChannelAboutFullMetadataRenderer(ChannelFullMetadata),
|
||||
|
||||
/// Contains video on startpage
|
||||
///
|
||||
/// Seems to be currently A/B tested on the channel page,
|
||||
|
|
@ -355,6 +358,47 @@ pub(crate) struct ReelPlayerHeaderRenderer {
|
|||
pub timestamp_text: String,
|
||||
}
|
||||
|
||||
#[serde_as]
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct ChannelFullMetadata {
|
||||
#[serde_as(as = "Text")]
|
||||
pub joined_date_text: String,
|
||||
#[serde_as(as = "Option<Text>")]
|
||||
pub view_count_text: Option<String>,
|
||||
#[serde(default)]
|
||||
#[serde_as(as = "VecSkipError<_>")]
|
||||
pub primary_links: Vec<PrimaryLink>,
|
||||
#[serde(default)]
|
||||
// #[serde_as(as = "VecSkipError<_>")]
|
||||
pub links: Vec<ExternalLink>,
|
||||
}
|
||||
|
||||
#[serde_as]
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct PrimaryLink {
|
||||
#[serde_as(as = "Text")]
|
||||
pub title: String,
|
||||
pub navigation_endpoint: NavigationEndpoint,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct ExternalLink {
|
||||
pub channel_external_link_view_model: ExternalLinkInner,
|
||||
}
|
||||
|
||||
#[serde_as]
|
||||
#[derive(Debug, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct ExternalLinkInner {
|
||||
#[serde_as(as = "AttributedText")]
|
||||
pub title: TextComponent,
|
||||
#[serde_as(as = "AttributedText")]
|
||||
pub link: TextComponent,
|
||||
}
|
||||
|
||||
trait IsLive {
|
||||
fn is_live(&self) -> bool;
|
||||
}
|
||||
|
|
@ -402,6 +446,7 @@ pub(crate) struct YouTubeListMapper<T> {
|
|||
pub warnings: Vec<String>,
|
||||
pub ctoken: Option<String>,
|
||||
pub corrected_query: Option<String>,
|
||||
pub channel_info: Option<ChannelInfo>,
|
||||
}
|
||||
|
||||
impl<T> YouTubeListMapper<T> {
|
||||
|
|
@ -413,6 +458,7 @@ impl<T> YouTubeListMapper<T> {
|
|||
warnings: Vec::new(),
|
||||
ctoken: None,
|
||||
corrected_query: None,
|
||||
channel_info: None,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -430,6 +476,7 @@ impl<T> YouTubeListMapper<T> {
|
|||
warnings,
|
||||
ctoken: None,
|
||||
corrected_query: None,
|
||||
channel_info: None,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -697,6 +744,32 @@ impl YouTubeListMapper<YouTubeItem> {
|
|||
YouTubeListItem::ShowingResultsForRenderer { corrected_query } => {
|
||||
self.corrected_query = Some(corrected_query);
|
||||
}
|
||||
YouTubeListItem::ChannelAboutFullMetadataRenderer(meta) => {
|
||||
let mut links = meta
|
||||
.primary_links
|
||||
.into_iter()
|
||||
.filter_map(|l| l.navigation_endpoint.url().map(|url| (l.title, url)))
|
||||
.collect::<Vec<_>>();
|
||||
for l in meta.links {
|
||||
let l = l.channel_external_link_view_model;
|
||||
if let TextComponent::Web { url, .. } = l.link {
|
||||
links.push((l.title.into(), util::sanitize_yt_url(&url)));
|
||||
}
|
||||
}
|
||||
|
||||
self.channel_info = Some(ChannelInfo {
|
||||
create_date: timeago::parse_textual_date_or_warn(
|
||||
self.lang,
|
||||
&meta.joined_date_text,
|
||||
&mut self.warnings,
|
||||
)
|
||||
.map(OffsetDateTime::date),
|
||||
view_count: meta
|
||||
.view_count_text
|
||||
.and_then(|txt| util::parse_numeric_or_warn(&txt, &mut self.warnings)),
|
||||
links,
|
||||
});
|
||||
}
|
||||
YouTubeListItem::RichItemRenderer { content } => {
|
||||
self.map_item(*content);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,15 +2,152 @@
|
|||
source: src/client/channel.rs
|
||||
expression: map_res.c
|
||||
---
|
||||
ChannelInfo(
|
||||
Channel(
|
||||
id: "UC2DjFE7Xf11URZqWBigcVOQ",
|
||||
url: "http://www.youtube.com/@EEVblog",
|
||||
name: "EEVblog",
|
||||
subscriber_count: Some(881000),
|
||||
avatar: [
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/ytc/AMLnZu9eKk4Nd16fX4Rn1TF1G7ReluwOl6M5558FTYAM=s48-c-k-c0x00ffffff-no-rj",
|
||||
width: 48,
|
||||
height: 48,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/ytc/AMLnZu9eKk4Nd16fX4Rn1TF1G7ReluwOl6M5558FTYAM=s88-c-k-c0x00ffffff-no-rj",
|
||||
width: 88,
|
||||
height: 88,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/ytc/AMLnZu9eKk4Nd16fX4Rn1TF1G7ReluwOl6M5558FTYAM=s176-c-k-c0x00ffffff-no-rj",
|
||||
width: 176,
|
||||
height: 176,
|
||||
),
|
||||
],
|
||||
verification: Verified,
|
||||
description: "NO SCRIPT, NO FEAR, ALL OPINION\nAn off-the-cuff Video Blog about Electronics Engineering, for engineers, hobbyists, enthusiasts, hackers and Makers\nHosted by Dave Jones from Sydney Australia\n\nDONATIONS:\nBitcoin: 3KqyH1U3qrMPnkLufM2oHDU7YB4zVZeFyZ\nEthereum: 0x99ccc4d2654ba40744a1f678d9868ecb15e91206\nPayPal: david@alternatezone.com\n\nPatreon: https://www.patreon.com/eevblog\n\nEEVblog2: http://www.youtube.com/EEVblog2\nEEVdiscover: https://www.youtube.com/channel/UCkGvUEt8iQLmq3aJIMjT2qQ\n\nEMAIL:\nAdvertising/Commercial: eevblog+business@gmail.com\nFan mail: eevblog+fan@gmail.com\nHate Mail: eevblog+hate@gmail.com\n\nI DON\'T DO PAID VIDEO SPONSORSHIPS, DON\'T ASK!\n\nPLEASE:\nDo NOT ask for personal advice on something, post it in the EEVblog forum.\nI read ALL email, but please don\'t be offended if I don\'t have time to reply, I get a LOT of email.\n\nMailbag\nPO Box 7949\nBaulkham Hills NSW 2153\nAUSTRALIA",
|
||||
subscriber_count: Some(920000),
|
||||
video_count: Some(1920),
|
||||
tags: [
|
||||
"electronics",
|
||||
"engineering",
|
||||
"maker",
|
||||
"hacker",
|
||||
"design",
|
||||
"circuit",
|
||||
"hardware",
|
||||
"pic",
|
||||
"atmel",
|
||||
"oscilloscope",
|
||||
"multimeter",
|
||||
"diy",
|
||||
"hobby",
|
||||
"review",
|
||||
"teardown",
|
||||
"microcontroller",
|
||||
"arduino",
|
||||
"video",
|
||||
"blog",
|
||||
"tutorial",
|
||||
"how-to",
|
||||
"interview",
|
||||
"rant",
|
||||
"industry",
|
||||
"news",
|
||||
"mailbag",
|
||||
"dumpster diving",
|
||||
"debunking",
|
||||
],
|
||||
vanity_url: Some("https://www.youtube.com/c/EevblogDave"),
|
||||
banner: [
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w1060-fcrop64=1,00005a57ffffa5a8-k-c0xffffffff-no-nd-rj",
|
||||
width: 1060,
|
||||
height: 175,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w1138-fcrop64=1,00005a57ffffa5a8-k-c0xffffffff-no-nd-rj",
|
||||
width: 1138,
|
||||
height: 188,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w1707-fcrop64=1,00005a57ffffa5a8-k-c0xffffffff-no-nd-rj",
|
||||
width: 1707,
|
||||
height: 283,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w2120-fcrop64=1,00005a57ffffa5a8-k-c0xffffffff-no-nd-rj",
|
||||
width: 2120,
|
||||
height: 351,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w2276-fcrop64=1,00005a57ffffa5a8-k-c0xffffffff-no-nd-rj",
|
||||
width: 2276,
|
||||
height: 377,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w2560-fcrop64=1,00005a57ffffa5a8-k-c0xffffffff-no-nd-rj",
|
||||
width: 2560,
|
||||
height: 424,
|
||||
),
|
||||
],
|
||||
mobile_banner: [
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w320-fcrop64=1,32b75a57cd48a5a8-k-c0xffffffff-no-nd-rj",
|
||||
width: 320,
|
||||
height: 88,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w640-fcrop64=1,32b75a57cd48a5a8-k-c0xffffffff-no-nd-rj",
|
||||
width: 640,
|
||||
height: 175,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w960-fcrop64=1,32b75a57cd48a5a8-k-c0xffffffff-no-nd-rj",
|
||||
width: 960,
|
||||
height: 263,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w1280-fcrop64=1,32b75a57cd48a5a8-k-c0xffffffff-no-nd-rj",
|
||||
width: 1280,
|
||||
height: 351,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w1440-fcrop64=1,32b75a57cd48a5a8-k-c0xffffffff-no-nd-rj",
|
||||
width: 1440,
|
||||
height: 395,
|
||||
),
|
||||
],
|
||||
tv_banner: [
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w320-fcrop64=1,00000000ffffffff-k-c0xffffffff-no-nd-rj",
|
||||
width: 320,
|
||||
height: 180,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w854-fcrop64=1,00000000ffffffff-k-c0xffffffff-no-nd-rj",
|
||||
width: 854,
|
||||
height: 480,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w1280-fcrop64=1,00000000ffffffff-k-c0xffffffff-no-nd-rj",
|
||||
width: 1280,
|
||||
height: 720,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w1920-fcrop64=1,00000000ffffffff-k-c0xffffffff-no-nd-rj",
|
||||
width: 1920,
|
||||
height: 1080,
|
||||
),
|
||||
Thumbnail(
|
||||
url: "https://yt3.ggpht.com/yIJ9ad80n49rK-YUcZLe_8bLmR-aGyg5ybDH_XKIc0GDWrC6s1Wzz8lxnq3_hux_5b6NHPZ9=w2120-fcrop64=1,00000000ffffffff-k-c0xffffffff-no-nd-rj",
|
||||
width: 2120,
|
||||
height: 1192,
|
||||
),
|
||||
],
|
||||
has_shorts: false,
|
||||
has_live: false,
|
||||
visitor_data: Some("CgszMUUzZDlGLWxiRSipqr2ZBg%3D%3D"),
|
||||
content: ChannelInfo(
|
||||
create_date: Some("2009-04-04"),
|
||||
view_count: Some(199087682),
|
||||
country: Some(AU),
|
||||
view_count: Some(186854342),
|
||||
links: [
|
||||
("EEVblog Web Site", "http://www.eevblog.com/"),
|
||||
("Twitter", "http://www.twitter.com/eevblog"),
|
||||
|
|
@ -26,4 +163,5 @@ ChannelInfo(
|
|||
("EEVblog AMAZON Store", "http://www.amazon.com/gp/redirect.html?ie=UTF8&location=http%3A%2F%2Fwww.amazon.com%2F&tag=ee04-20&linkCode=ur2&camp=1789&creative=390957"),
|
||||
("2nd EEVblog Channel", "http://www.youtube.com/EEVblog2"),
|
||||
],
|
||||
),
|
||||
)
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -738,31 +738,16 @@ pub struct Channel<T> {
|
|||
pub content: T,
|
||||
}
|
||||
|
||||
/// Detailed channel information
|
||||
/// Additional channel metadata fetched from the "About" tab.
|
||||
#[serde_as]
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[non_exhaustive]
|
||||
pub struct ChannelInfo {
|
||||
/// Unique YouTube Channel-ID (e.g. `UC-lHJZR3Gqxm24_Vd_AJ5Yw`)
|
||||
pub id: String,
|
||||
/// Channel URL
|
||||
pub url: String,
|
||||
/// Channel description text
|
||||
pub description: String,
|
||||
/// Channel subscriber count
|
||||
///
|
||||
/// [`None`] if the subscriber count was hidden by the owner
|
||||
/// or could not be parsed.
|
||||
pub subscriber_count: Option<u64>,
|
||||
/// Channel video count
|
||||
pub video_count: Option<u64>,
|
||||
/// Channel creation date
|
||||
#[serde_as(as = "Option<DateYmd>")]
|
||||
pub create_date: Option<Date>,
|
||||
/// Channel view count
|
||||
pub view_count: Option<u64>,
|
||||
/// Channel origin country
|
||||
pub country: Option<Country>,
|
||||
/// Links to other websites or social media profiles
|
||||
pub links: Vec<(String, String)>,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -419,207 +419,202 @@ pub enum Country {
|
|||
}
|
||||
|
||||
/// Array of all available languages
|
||||
/// The languages are sorted by their native names. This array can be used to display
|
||||
/// a language selection or to get the language code from a language name using binary search.
|
||||
pub const LANGUAGES: [Language; 83] = [
|
||||
Language::Af,
|
||||
Language::Am,
|
||||
Language::Ar,
|
||||
Language::As,
|
||||
Language::Az,
|
||||
Language::Id,
|
||||
Language::Ms,
|
||||
Language::Be,
|
||||
Language::Bg,
|
||||
Language::Bn,
|
||||
Language::Bs,
|
||||
Language::Ca,
|
||||
Language::Cs,
|
||||
Language::Da,
|
||||
Language::De,
|
||||
Language::Et,
|
||||
Language::EnIn,
|
||||
Language::EnGb,
|
||||
Language::El,
|
||||
Language::En,
|
||||
Language::EnGb,
|
||||
Language::EnIn,
|
||||
Language::Es,
|
||||
Language::Es419,
|
||||
Language::EsUs,
|
||||
Language::Et,
|
||||
Language::Eu,
|
||||
Language::Fa,
|
||||
Language::Fi,
|
||||
Language::Fil,
|
||||
Language::Fr,
|
||||
Language::FrCa,
|
||||
Language::Gl,
|
||||
Language::Gu,
|
||||
Language::Hi,
|
||||
Language::Hr,
|
||||
Language::Zu,
|
||||
Language::It,
|
||||
Language::Sw,
|
||||
Language::Lv,
|
||||
Language::Lt,
|
||||
Language::Hu,
|
||||
Language::Hy,
|
||||
Language::Id,
|
||||
Language::Is,
|
||||
Language::It,
|
||||
Language::Iw,
|
||||
Language::Ja,
|
||||
Language::Ka,
|
||||
Language::Kk,
|
||||
Language::Km,
|
||||
Language::Kn,
|
||||
Language::Ko,
|
||||
Language::Ky,
|
||||
Language::Lo,
|
||||
Language::Lt,
|
||||
Language::Lv,
|
||||
Language::Mk,
|
||||
Language::Ml,
|
||||
Language::Mn,
|
||||
Language::Mr,
|
||||
Language::Ms,
|
||||
Language::My,
|
||||
Language::Ne,
|
||||
Language::Nl,
|
||||
Language::No,
|
||||
Language::Uz,
|
||||
Language::Or,
|
||||
Language::Pa,
|
||||
Language::Pl,
|
||||
Language::PtPt,
|
||||
Language::Pt,
|
||||
Language::PtPt,
|
||||
Language::Ro,
|
||||
Language::Sq,
|
||||
Language::Ru,
|
||||
Language::Si,
|
||||
Language::Sk,
|
||||
Language::Sl,
|
||||
Language::SrLatn,
|
||||
Language::Fi,
|
||||
Language::Sv,
|
||||
Language::Vi,
|
||||
Language::Tr,
|
||||
Language::Is,
|
||||
Language::Cs,
|
||||
Language::El,
|
||||
Language::Be,
|
||||
Language::Bg,
|
||||
Language::Ky,
|
||||
Language::Mk,
|
||||
Language::Mn,
|
||||
Language::Ru,
|
||||
Language::Sq,
|
||||
Language::Sr,
|
||||
Language::Uk,
|
||||
Language::Kk,
|
||||
Language::Hy,
|
||||
Language::Iw,
|
||||
Language::Ur,
|
||||
Language::Ar,
|
||||
Language::Fa,
|
||||
Language::Ne,
|
||||
Language::Mr,
|
||||
Language::Hi,
|
||||
Language::As,
|
||||
Language::Bn,
|
||||
Language::Pa,
|
||||
Language::Gu,
|
||||
Language::Or,
|
||||
Language::SrLatn,
|
||||
Language::Sv,
|
||||
Language::Sw,
|
||||
Language::Ta,
|
||||
Language::Te,
|
||||
Language::Kn,
|
||||
Language::Ml,
|
||||
Language::Si,
|
||||
Language::Th,
|
||||
Language::Lo,
|
||||
Language::My,
|
||||
Language::Ka,
|
||||
Language::Am,
|
||||
Language::Km,
|
||||
Language::Tr,
|
||||
Language::Uk,
|
||||
Language::Ur,
|
||||
Language::Uz,
|
||||
Language::Vi,
|
||||
Language::ZhCn,
|
||||
Language::ZhTw,
|
||||
Language::ZhHk,
|
||||
Language::Ja,
|
||||
Language::Ko,
|
||||
Language::ZhTw,
|
||||
Language::Zu,
|
||||
];
|
||||
|
||||
/// Array of all available countries
|
||||
///
|
||||
/// The countries are sorted by their english names. This array can be used to display
|
||||
/// a country selection or to get the country code from a country name using binary search.
|
||||
pub const COUNTRIES: [Country; 109] = [
|
||||
Country::Dz,
|
||||
Country::Ae,
|
||||
Country::Ar,
|
||||
Country::Au,
|
||||
Country::At,
|
||||
Country::Au,
|
||||
Country::Az,
|
||||
Country::Bh,
|
||||
Country::Bd,
|
||||
Country::By,
|
||||
Country::Be,
|
||||
Country::Bo,
|
||||
Country::Ba,
|
||||
Country::Br,
|
||||
Country::Bd,
|
||||
Country::Be,
|
||||
Country::Bg,
|
||||
Country::Kh,
|
||||
Country::Bh,
|
||||
Country::Bo,
|
||||
Country::Br,
|
||||
Country::By,
|
||||
Country::Ca,
|
||||
Country::Ch,
|
||||
Country::Cl,
|
||||
Country::Co,
|
||||
Country::Cr,
|
||||
Country::Hr,
|
||||
Country::Cy,
|
||||
Country::Cz,
|
||||
Country::De,
|
||||
Country::Dk,
|
||||
Country::Do,
|
||||
Country::Dz,
|
||||
Country::Ec,
|
||||
Country::Eg,
|
||||
Country::Sv,
|
||||
Country::Ee,
|
||||
Country::Eg,
|
||||
Country::Es,
|
||||
Country::Fi,
|
||||
Country::Fr,
|
||||
Country::Gb,
|
||||
Country::Ge,
|
||||
Country::De,
|
||||
Country::Gh,
|
||||
Country::Gr,
|
||||
Country::Gt,
|
||||
Country::Hn,
|
||||
Country::Hk,
|
||||
Country::Hn,
|
||||
Country::Hr,
|
||||
Country::Hu,
|
||||
Country::Is,
|
||||
Country::In,
|
||||
Country::Id,
|
||||
Country::Iq,
|
||||
Country::Ie,
|
||||
Country::Il,
|
||||
Country::In,
|
||||
Country::Iq,
|
||||
Country::Is,
|
||||
Country::It,
|
||||
Country::Jm,
|
||||
Country::Jp,
|
||||
Country::Jo,
|
||||
Country::Kz,
|
||||
Country::Jp,
|
||||
Country::Ke,
|
||||
Country::Kh,
|
||||
Country::Kr,
|
||||
Country::Kw,
|
||||
Country::Kz,
|
||||
Country::La,
|
||||
Country::Lv,
|
||||
Country::Lb,
|
||||
Country::Ly,
|
||||
Country::Li,
|
||||
Country::Lk,
|
||||
Country::Lt,
|
||||
Country::Lu,
|
||||
Country::My,
|
||||
Country::Lv,
|
||||
Country::Ly,
|
||||
Country::Ma,
|
||||
Country::Me,
|
||||
Country::Mk,
|
||||
Country::Mt,
|
||||
Country::Mx,
|
||||
Country::Me,
|
||||
Country::Ma,
|
||||
Country::Np,
|
||||
Country::Nl,
|
||||
Country::Nz,
|
||||
Country::Ni,
|
||||
Country::My,
|
||||
Country::Ng,
|
||||
Country::Mk,
|
||||
Country::Ni,
|
||||
Country::Nl,
|
||||
Country::No,
|
||||
Country::Np,
|
||||
Country::Nz,
|
||||
Country::Om,
|
||||
Country::Pk,
|
||||
Country::Pa,
|
||||
Country::Pg,
|
||||
Country::Py,
|
||||
Country::Pe,
|
||||
Country::Pg,
|
||||
Country::Ph,
|
||||
Country::Pk,
|
||||
Country::Pl,
|
||||
Country::Pt,
|
||||
Country::Pr,
|
||||
Country::Pt,
|
||||
Country::Py,
|
||||
Country::Qa,
|
||||
Country::Ro,
|
||||
Country::Rs,
|
||||
Country::Ru,
|
||||
Country::Sa,
|
||||
Country::Sn,
|
||||
Country::Rs,
|
||||
Country::Sg,
|
||||
Country::Sk,
|
||||
Country::Si,
|
||||
Country::Za,
|
||||
Country::Kr,
|
||||
Country::Es,
|
||||
Country::Lk,
|
||||
Country::Se,
|
||||
Country::Ch,
|
||||
Country::Tw,
|
||||
Country::Tz,
|
||||
Country::Sg,
|
||||
Country::Si,
|
||||
Country::Sk,
|
||||
Country::Sn,
|
||||
Country::Sv,
|
||||
Country::Th,
|
||||
Country::Tn,
|
||||
Country::Tr,
|
||||
Country::Ug,
|
||||
Country::Tw,
|
||||
Country::Tz,
|
||||
Country::Ua,
|
||||
Country::Ae,
|
||||
Country::Gb,
|
||||
Country::Ug,
|
||||
Country::Us,
|
||||
Country::Uy,
|
||||
Country::Ve,
|
||||
Country::Vn,
|
||||
Country::Ye,
|
||||
Country::Za,
|
||||
Country::Zw,
|
||||
];
|
||||
|
||||
|
|
@ -849,7 +844,11 @@ impl FromStr for Language {
|
|||
Some(pos) => {
|
||||
sub = &sub[..pos];
|
||||
}
|
||||
None => return Err(Error::Other("could not parse language `{s}`".into())),
|
||||
None => {
|
||||
return Err(Error::Other(
|
||||
format!("could not parse language `{s}`").into(),
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,7 @@ use serde::{Deserialize, Deserializer};
|
|||
use serde_with::{serde_as, DeserializeAs, VecSkipError};
|
||||
|
||||
use crate::{
|
||||
client::response::url_endpoint::{
|
||||
MusicPage, MusicPageType, MusicVideoType, NavigationEndpoint, PageType,
|
||||
},
|
||||
client::response::url_endpoint::{MusicVideoType, NavigationEndpoint, PageType},
|
||||
model::UrlTarget,
|
||||
util,
|
||||
};
|
||||
|
|
@ -46,14 +44,13 @@ use crate::{
|
|||
#[serde(untagged)]
|
||||
pub(crate) enum Text {
|
||||
Simple {
|
||||
#[serde(alias = "simpleText", alias = "content")]
|
||||
#[serde(alias = "simpleText")]
|
||||
text: String,
|
||||
},
|
||||
Multiple {
|
||||
#[serde_as(as = "Vec<Text>")]
|
||||
runs: Vec<String>,
|
||||
},
|
||||
Str(String),
|
||||
}
|
||||
|
||||
impl<'de> DeserializeAs<'de, String> for Text {
|
||||
|
|
@ -63,7 +60,7 @@ impl<'de> DeserializeAs<'de, String> for Text {
|
|||
{
|
||||
let text = Text::deserialize(deserializer)?;
|
||||
match text {
|
||||
Text::Simple { text } | Text::Str(text) => Ok(text),
|
||||
Text::Simple { text } => Ok(text),
|
||||
Text::Multiple { runs } => Ok(runs.join("")),
|
||||
}
|
||||
}
|
||||
|
|
@ -76,7 +73,7 @@ impl<'de> DeserializeAs<'de, Vec<String>> for Text {
|
|||
{
|
||||
let text = Text::deserialize(deserializer)?;
|
||||
match text {
|
||||
Text::Simple { text } | Text::Str(text) => Ok(vec![text]),
|
||||
Text::Simple { text } => Ok(vec![text]),
|
||||
Text::Multiple { runs } => Ok(runs),
|
||||
}
|
||||
}
|
||||
|
|
@ -421,23 +418,6 @@ impl TextComponent {
|
|||
| TextComponent::Text { text } => text,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn music_page(self) -> Option<MusicPage> {
|
||||
match self {
|
||||
TextComponent::Video {
|
||||
video_id, vtype, ..
|
||||
} => Some(MusicPage {
|
||||
id: video_id,
|
||||
typ: MusicPageType::Track { vtype },
|
||||
}),
|
||||
TextComponent::Browse {
|
||||
page_type,
|
||||
browse_id,
|
||||
..
|
||||
} => Some(MusicPage::from_browse(browse_id, page_type)),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<TextComponent> for String {
|
||||
|
|
@ -562,7 +542,6 @@ mod tests {
|
|||
}"#,
|
||||
vec!["Abo für ", "MBCkpop", " beenden?"]
|
||||
)]
|
||||
#[case(r#"{"txt":"Hello World"}"#, vec!["Hello World"])]
|
||||
fn t_deserialize_text(#[case] test_json: &str, #[case] exp: Vec<&str>) {
|
||||
#[serde_as]
|
||||
#[derive(Deserialize)]
|
||||
|
|
|
|||
|
|
@ -19,11 +19,7 @@ use rand::Rng;
|
|||
use regex::Regex;
|
||||
use url::Url;
|
||||
|
||||
use crate::{
|
||||
error::Error,
|
||||
param::{Country, Language, COUNTRIES},
|
||||
serializer::text::TextComponent,
|
||||
};
|
||||
use crate::{error::Error, param::Language, serializer::text::TextComponent};
|
||||
|
||||
pub static VIDEO_ID_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^[A-Za-z0-9_-]{11}$").unwrap());
|
||||
pub static CHANNEL_ID_REGEX: Lazy<Regex> =
|
||||
|
|
@ -41,8 +37,6 @@ pub const DOT_SEPARATOR: &str = " • ";
|
|||
pub const VARIOUS_ARTISTS: &str = "Various Artists";
|
||||
pub const PLAYLIST_ID_ALBUM_PREFIX: &str = "OLAK";
|
||||
pub const ARTIST_DISCOGRAPHY_PREFIX: &str = "MPAD";
|
||||
pub const PODCAST_PLAYLIST_PREFIX: &str = "MPSP";
|
||||
pub const PODCAST_EPISODE_PREFIX: &str = "MPED";
|
||||
|
||||
const CONTENT_PLAYBACK_NONCE_ALPHABET: &[u8; 64] =
|
||||
b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
|
||||
|
|
@ -468,19 +462,6 @@ pub fn b64_decode<T: AsRef<[u8]>>(input: T) -> Result<Vec<u8>, base64::DecodeErr
|
|||
base64::engine::general_purpose::STANDARD.decode(input)
|
||||
}
|
||||
|
||||
/// Get the country from its English name
|
||||
pub fn country_from_name(name: &str) -> Option<Country> {
|
||||
COUNTRIES
|
||||
.binary_search_by_key(&name, Country::name)
|
||||
.ok()
|
||||
.map(|i| COUNTRIES[i])
|
||||
}
|
||||
|
||||
/// Strip prefix from string if presend
|
||||
pub fn strip_prefix(s: &str, prefix: &str) -> String {
|
||||
s.strip_prefix(prefix).unwrap_or(s).to_string()
|
||||
}
|
||||
|
||||
/// An iterator over the chars in a string (in str format)
|
||||
pub struct SplitChar<'a> {
|
||||
txt: &'a str,
|
||||
|
|
@ -704,13 +685,4 @@ pub(crate) mod tests {
|
|||
let res = Language::from_str(s).ok();
|
||||
assert_eq!(res, expect);
|
||||
}
|
||||
|
||||
#[rstest]
|
||||
#[case("United States", Some(Country::Us))]
|
||||
#[case("Zimbabwe", Some(Country::Zw))]
|
||||
#[case("foobar", None)]
|
||||
fn t_country_from_name(#[case] name: &str, #[case] expect: Option<Country>) {
|
||||
let res = country_from_name(name);
|
||||
assert_eq!(res, expect);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -39,10 +39,7 @@ fn get_player_from_client(#[case] client_type: ClientType, rp: RustyPipe) {
|
|||
// dbg!(&player_data);
|
||||
|
||||
assert_eq!(player_data.details.id, "n4tK7LYFxI0");
|
||||
assert_eq!(
|
||||
player_data.details.name,
|
||||
"Spektrem - Shine | Progressive House | NCS - Copyright Free Music"
|
||||
);
|
||||
assert_eq!(player_data.details.name, "Spektrem - Shine [NCS Release]");
|
||||
if client_type == ClientType::DesktopMusic {
|
||||
assert!(player_data.details.description.is_none());
|
||||
} else {
|
||||
|
|
@ -71,9 +68,9 @@ fn get_player_from_client(#[case] client_type: ClientType, rp: RustyPipe) {
|
|||
.unwrap();
|
||||
|
||||
// Bitrates may change between requests
|
||||
assert_approx(f64::from(video.bitrate), 1_851_854.0);
|
||||
assert_eq!(video.average_bitrate, 923_766);
|
||||
assert_eq!(video.size.unwrap(), 29_909_835);
|
||||
assert_approx(f64::from(video.bitrate), 1_507_068.0);
|
||||
assert_eq!(video.average_bitrate, 1_345_149);
|
||||
assert_eq!(video.size.unwrap(), 43_553_412);
|
||||
assert_eq!(video.width, 1280);
|
||||
assert_eq!(video.height, 720);
|
||||
assert_eq!(video.fps, 30);
|
||||
|
|
@ -105,8 +102,8 @@ fn get_player_from_client(#[case] client_type: ClientType, rp: RustyPipe) {
|
|||
.expect("audio stream not found");
|
||||
|
||||
assert_approx(f64::from(video.bitrate), 1_340_829.0);
|
||||
assert_approx(f64::from(video.average_bitrate), 1_046_557.0);
|
||||
assert_approx(video.size.unwrap() as f64, 33_885_572.0);
|
||||
assert_approx(f64::from(video.average_bitrate), 1_233_444.0);
|
||||
assert_approx(video.size.unwrap() as f64, 39_936_630.0);
|
||||
assert_eq!(video.width, 1280);
|
||||
assert_eq!(video.height, 720);
|
||||
assert_eq!(video.fps, 30);
|
||||
|
|
@ -859,15 +856,22 @@ fn channel_playlists(rp: RustyPipe) {
|
|||
|
||||
#[rstest]
|
||||
fn channel_info(rp: RustyPipe) {
|
||||
let info = tokio_test::block_on(rp.query().channel_info("UC2DjFE7Xf11URZqWBigcVOQ")).unwrap();
|
||||
let channel =
|
||||
tokio_test::block_on(rp.query().channel_info("UC2DjFE7Xf11URZqWBigcVOQ")).unwrap();
|
||||
|
||||
assert_eq!(info.create_date.unwrap(), date!(2009 - 4 - 4));
|
||||
assert_gte(info.view_count.unwrap(), 186_854_340, "channel views");
|
||||
assert_gte(info.video_count.unwrap(), 1920, "channel videos");
|
||||
assert_gte(info.subscriber_count.unwrap(), 920_000, "subscribers");
|
||||
assert_eq!(info.country.unwrap(), Country::Au);
|
||||
// dbg!(&channel);
|
||||
assert_channel_eevblog(&channel);
|
||||
|
||||
insta::assert_ron_snapshot!(info.links, @r###"
|
||||
let created = channel.content.create_date.unwrap();
|
||||
assert_eq!(created, date!(2009 - 4 - 4));
|
||||
|
||||
assert_gte(
|
||||
channel.content.view_count.unwrap(),
|
||||
186_854_340,
|
||||
"channel views",
|
||||
);
|
||||
|
||||
insta::assert_ron_snapshot!(channel.content.links, @r###"
|
||||
[
|
||||
("EEVblog Web Site", "http://www.eevblog.com/"),
|
||||
("Twitter", "http://www.twitter.com/eevblog"),
|
||||
|
|
@ -963,8 +967,8 @@ fn channel_more(
|
|||
);
|
||||
}
|
||||
|
||||
let info = tokio_test::block_on(rp.query().channel_info(&id)).unwrap();
|
||||
assert_eq!(info.id, id);
|
||||
let channel_info = tokio_test::block_on(rp.query().channel_info(&id)).unwrap();
|
||||
assert_channel(&channel_info, id, name, unlocalized || name_unlocalized);
|
||||
}
|
||||
|
||||
#[rstest]
|
||||
|
|
@ -1664,9 +1668,7 @@ fn music_search_tracks(rp: RustyPipe, unlocalized: bool) {
|
|||
.items
|
||||
.iter()
|
||||
.find(|a| a.id == "BL-aIpCLWnU")
|
||||
.unwrap_or_else(|| {
|
||||
panic!("could not find track, got {:#?}", &res.items.items);
|
||||
});
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(track.name, "Black Mamba");
|
||||
assert!(!track.cover.is_empty(), "got no cover");
|
||||
|
|
@ -1701,9 +1703,7 @@ fn music_search_videos(rp: RustyPipe, unlocalized: bool) {
|
|||
.items
|
||||
.iter()
|
||||
.find(|a| a.id == "ZeerrnuLi5E")
|
||||
.unwrap_or_else(|| {
|
||||
panic!("could not find video, got {:#?}", &res.items.items);
|
||||
});
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(track.name, "Black Mamba");
|
||||
assert!(!track.cover.is_empty(), "got no cover");
|
||||
|
|
@ -1743,12 +1743,7 @@ fn music_search_episode(rp: RustyPipe, #[case] videos: bool) {
|
|||
.tracks
|
||||
};
|
||||
|
||||
let track = &tracks
|
||||
.iter()
|
||||
.find(|a| a.id == "Zq_-LDy7AgE")
|
||||
.unwrap_or_else(|| {
|
||||
panic!("could not find episode, got {:#?}", &tracks);
|
||||
});
|
||||
let track = &tracks.iter().find(|a| a.id == "Zq_-LDy7AgE").unwrap();
|
||||
|
||||
assert_eq!(track.artists.len(), 1);
|
||||
let track_artist = &track.artists[0];
|
||||
|
|
@ -1814,14 +1809,7 @@ fn music_search_albums(
|
|||
) {
|
||||
let res = tokio_test::block_on(rp.query().music_search_albums(query)).unwrap();
|
||||
|
||||
let album = &res
|
||||
.items
|
||||
.items
|
||||
.iter()
|
||||
.find(|a| a.id == id)
|
||||
.unwrap_or_else(|| {
|
||||
panic!("could not find album, got {:#?}", &res.items.items);
|
||||
});
|
||||
let album = &res.items.items.iter().find(|a| a.id == id).unwrap();
|
||||
assert_eq!(album.name, name);
|
||||
|
||||
assert_eq!(album.artists.len(), 1);
|
||||
|
|
@ -1852,9 +1840,7 @@ fn music_search_artists(rp: RustyPipe, unlocalized: bool) {
|
|||
.items
|
||||
.iter()
|
||||
.find(|a| a.id == "UCIh4j8fXWf2U0ro0qnGU8Mg")
|
||||
.unwrap_or_else(|| {
|
||||
panic!("could not find artist, got {:#?}", &res.items.items);
|
||||
});
|
||||
.unwrap();
|
||||
if unlocalized {
|
||||
assert_eq!(artist.name, "Namika");
|
||||
}
|
||||
|
|
@ -1889,9 +1875,7 @@ fn music_search_playlists(rp: RustyPipe, unlocalized: bool) {
|
|||
.items
|
||||
.iter()
|
||||
.find(|p| p.id == "RDCLAK5uy_nLtxizvEMkzYQUrA-bFf6MnBeR4bGYWUQ")
|
||||
.unwrap_or_else(|| {
|
||||
panic!("could not find playlist, got {:#?}", &res.items.items);
|
||||
});
|
||||
.expect("no playlist");
|
||||
|
||||
if unlocalized {
|
||||
assert_eq!(playlist.name, "Today's Rock Hits");
|
||||
|
|
@ -1921,9 +1905,7 @@ fn music_search_playlists_community(rp: RustyPipe) {
|
|||
.items
|
||||
.iter()
|
||||
.find(|p| p.id == "PLMC9KNkIncKtGvr2kFRuXBVmBev6cAJ2u")
|
||||
.unwrap_or_else(|| {
|
||||
panic!("could not find playlist, got {:#?}", &res.items.items);
|
||||
});
|
||||
.expect("no playlist");
|
||||
|
||||
assert_eq!(
|
||||
playlist.name,
|
||||
|
|
@ -2465,8 +2447,8 @@ fn assert_frameset(frameset: &Frameset) {
|
|||
assert_gte(frameset.frame_height, 20, "frame width");
|
||||
assert_gte(frameset.page_count, 1, "page count");
|
||||
assert_gte(frameset.total_count, 50, "total count");
|
||||
assert_gte(frameset.frames_per_page_x, 3, "frames per page x");
|
||||
assert_gte(frameset.frames_per_page_y, 3, "frames per page y");
|
||||
assert_gte(frameset.frames_per_page_x, 5, "frames per page x");
|
||||
assert_gte(frameset.frames_per_page_y, 5, "frames per page y");
|
||||
|
||||
let n = frameset.urls().count() as u32;
|
||||
assert_eq!(n, frameset.page_count);
|
||||
|
|
|
|||
Loading…
Reference in a new issue