refactor: remove thiserror for now
This commit is contained in:
parent
94c9a264a4
commit
df6543d62e
5 changed files with 14 additions and 65 deletions
|
|
@ -259,21 +259,22 @@ fn map_playlist_items(
|
|||
}
|
||||
|
||||
impl Paginator<PlaylistVideo> {
|
||||
pub async fn next(&self, query: RustyPipeQuery) -> Result<Self, crate::error::Error> {
|
||||
match &self.ctoken {
|
||||
Some(ctoken) => Ok(query.get_playlist_continuation(ctoken).await?),
|
||||
None => Err(crate::error::Error::PaginatorExhausted),
|
||||
}
|
||||
pub async fn next(&self, query: RustyPipeQuery) -> Result<Option<Self>> {
|
||||
Ok(match &self.ctoken {
|
||||
Some(ctoken) => Some(query.get_playlist_continuation(ctoken).await?),
|
||||
None => None,
|
||||
})
|
||||
}
|
||||
|
||||
pub async fn extend(&mut self, query: RustyPipeQuery) -> Result<(), crate::error::Error> {
|
||||
pub async fn extend(&mut self, query: RustyPipeQuery) -> Result<bool> {
|
||||
match self.next(query).await {
|
||||
Ok(paginator) => {
|
||||
Ok(Some(paginator)) => {
|
||||
let mut items = paginator.items;
|
||||
self.items.append(&mut items);
|
||||
self.ctoken = paginator.ctoken;
|
||||
Ok(())
|
||||
Ok(true)
|
||||
}
|
||||
Ok(None) => Ok(false),
|
||||
Err(e) => Err(e),
|
||||
}
|
||||
}
|
||||
|
|
@ -281,11 +282,11 @@ impl Paginator<PlaylistVideo> {
|
|||
pub async fn extend_pages(&mut self, query: RustyPipeQuery, n_pages: usize) -> Result<()> {
|
||||
for _ in 0..n_pages {
|
||||
match self.extend(query.clone()).await {
|
||||
Err(crate::error::Error::PaginatorExhausted) => {
|
||||
Ok(false) => {
|
||||
break;
|
||||
}
|
||||
Err(e) => {
|
||||
return Err(e.into());
|
||||
return Err(e);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
|
@ -296,11 +297,11 @@ impl Paginator<PlaylistVideo> {
|
|||
pub async fn extend_limit(&mut self, query: RustyPipeQuery, n_items: usize) -> Result<()> {
|
||||
while self.items.len() < n_items {
|
||||
match self.extend(query.clone()).await {
|
||||
Err(crate::error::Error::PaginatorExhausted) => {
|
||||
Ok(false) => {
|
||||
break;
|
||||
}
|
||||
Err(e) => {
|
||||
return Err(e.into());
|
||||
return Err(e);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
|
|
|||
50
src/error.rs
50
src/error.rs
|
|
@ -1,50 +0,0 @@
|
|||
/// Errors that can occur during the id extraction or the video download process.
|
||||
#[derive(thiserror::Error, Debug)]
|
||||
pub enum Error {
|
||||
/*
|
||||
#[error("the provided raw Id does not match any known Id-pattern")]
|
||||
BadIdFormat,
|
||||
#[cfg(feature = "fetch")]
|
||||
#[error("the video you requested is unavailable:\n{0:#?}")]
|
||||
VideoUnavailable(Box<crate::video_info::player_response::playability_status::PlayabilityStatus>),
|
||||
#[cfg(feature = "download")]
|
||||
#[error("the video contains no streams")]
|
||||
NoStreams,
|
||||
|
||||
#[error(transparent)]
|
||||
#[cfg(feature = "fetch")]
|
||||
IO(#[from] std::io::Error),
|
||||
#[error(transparent)]
|
||||
#[cfg(feature = "fetch")]
|
||||
Request(#[from] reqwest::Error),
|
||||
#[error("YouTube returned an unexpected response: `{0}`")]
|
||||
UnexpectedResponse(String),
|
||||
#[error(transparent)]
|
||||
#[cfg(feature = "fetch")]
|
||||
QueryDeserialization(#[from] serde_qs::Error),
|
||||
#[error(transparent)]
|
||||
#[cfg(feature = "fetch")]
|
||||
JsonDeserialization(#[from] serde_json::Error),
|
||||
#[error(transparent)]
|
||||
UrlParseError(#[from] url::ParseError),
|
||||
|
||||
#[error("{0}")]
|
||||
Custom(String),
|
||||
#[error("a potentially dangerous error occurred: {0}")]
|
||||
Fatal(String),
|
||||
#[error(
|
||||
"the error, which occurred is not meant an error, but is used for internal comunication.\
|
||||
This error should never be propagated to the public API."
|
||||
)]
|
||||
Internal(&'static str),
|
||||
#[error("The internal channel has been closed")]
|
||||
#[cfg(feature = "callback")]
|
||||
ChannelClosed,
|
||||
*/
|
||||
#[error("paginator is exhausted")]
|
||||
PaginatorExhausted,
|
||||
|
||||
// TODO: Remove anyhow
|
||||
#[error(transparent)]
|
||||
Anyhow(#[from] anyhow::Error),
|
||||
}
|
||||
|
|
@ -12,7 +12,6 @@ mod util;
|
|||
pub mod cache;
|
||||
pub mod client;
|
||||
pub mod download;
|
||||
pub mod error;
|
||||
pub mod model;
|
||||
pub mod report;
|
||||
pub mod timeago;
|
||||
|
|
|
|||
Reference in a new issue