Sulkta-OSS/rustypipe
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat!: remove TvHtml5Embed client as it got disabled

Browse source
This commit is contained in:
ThetaDev 2024-10-23 00:52:17 +02:00
parent 79a62816ff
commit 9e835c8f38
No known key found for this signature in database
GPG key ID: E319D3C5148D65B6
6 changed files with 32 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/client/player.rs
View file

@ -83,33 +83,30 @@ impl RustyPipeQuery {
clients: &[ClientType],
) -> Result<VideoPlayer, Error> {
let video_id = video_id.as_ref();
let mut last_e = Error::Other("no clients".into());
let last_e = Error::Other("no clients".into());
for client in clients {
let res = self.player_from_client(video_id, *client).await;
match res {
Ok(res) => return Ok(res),
Err(Error::Extraction(e)) => {
if e.switch_client() {
if let ExtractionError::Unavailable {
reason: UnavailabilityReason::AgeRestricted,
msg,
} = &e
{
if let Ok(res) = self
.player_from_client(video_id, ClientType::TvHtml5Embed)
.await
{
return Ok(res);
} else {
return Err(Error::Extraction(ExtractionError::Unavailable {
reason: UnavailabilityReason::AgeRestricted,
msg: msg.to_owned(),
}));
// TODO: fetch age-restricted videos with login
/*
if e.use_login() {
tracing::info!("{e}; fetching player with login");
match self.player_from_client(video_id, *client).await {
Ok(res) => return Ok(res),
Err(Error::Extraction(e)) => {
if !e.switch_client() {
return Err(Error::Extraction(e));
}
}
Err(e) => return Err(e),
}
last_e = Error::Extraction(e);
} else {
} else*/
if !e.switch_client() {
return Err(Error::Extraction(e));
}
}
@ -747,7 +744,6 @@ mod tests {
#[case::desktop(ClientType::Desktop)]
#[case::desktop_music(ClientType::DesktopMusic)]
#[case::tv(ClientType::Tv)]
#[case::tv_html5_embed(ClientType::TvHtml5Embed)]
#[case::android(ClientType::Android)]
#[case::ios(ClientType::Ios)]
fn map_player_data(#[case] client_type: ClientType) {