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

refactor!: add client_type field to DownloadError, rename cli option po-token-cache to pot-cache

Browse source
This commit is contained in:
ThetaDev 2025-02-06 13:47:10 +01:00
parent 5f5ac65ce9
commit 594e675b39
No known key found for this signature in database
GPG key ID: E319D3C5148D65B6
4 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
downloader/src/error.rs
View file

@ -13,8 +13,13 @@ pub enum DownloadError {
#[error("http error: {0}")]
Http(#[from] reqwest::Error),
/// 403 error trying to download video
#[error("YouTube returned 403 error; visitor_data={}", .1.as_deref().unwrap_or_default())]
Forbidden(ClientType, Option<String>),
#[error("YouTube returned 403 error; visitor_data={}", .visitor_data.as_deref().unwrap_or_default())]
Forbidden {
/// Client type used to fetch the failed stream
client_type: ClientType,
/// Visitor data used to fetch the failed stream
visitor_data: Option<String>,
},
/// File IO error
#[error(transparent)]
Io(#[from] std::io::Error),

20
downloader/src/lib.rs
View file

@ -660,9 +660,15 @@ impl DownloadQuery {
.await
{
Ok(res) => return Ok(res),
Err(DownloadError::Forbidden(c, vd)) => {
failed_client = Some(c);
DownloadError::Forbidden(c, vd)
Err(DownloadError::Forbidden {
client_type,
visitor_data,
}) => {
failed_client = Some(client_type);
DownloadError::Forbidden {
client_type,
visitor_data,
}
}
Err(DownloadError::Http(e)) => {
if !e.is_timeout() {
@ -842,10 +848,10 @@ impl DownloadQuery {
if let Some(vd) = &player_data.visitor_data {
q.remove_visitor_data(vd);
}
return DownloadError::Forbidden(
player_data.client_type,
player_data.visitor_data.clone(),
);
return DownloadError::Forbidden {
client_type: player_data.client_type,
visitor_data: player_data.visitor_data.clone(),
};
}
}
e