update memory input stream errors handler

This commit is contained in:
yggverse 2024-11-27 15:39:37 +02:00
parent 3a9e84a3d9
commit 239786da6a
6 changed files with 27 additions and 12 deletions

View file

@ -20,7 +20,7 @@ pub fn from_stream_async(
bytes_in_chunk: usize,
bytes_total_limit: usize,
on_chunk: impl Fn((Bytes, usize)) + 'static,
on_complete: impl FnOnce(Result<MemoryInputStream, (Error, Option<&str>)>) + 'static,
on_complete: impl FnOnce(Result<MemoryInputStream, Error>) + 'static,
) {
read_all_from_stream_async(
MemoryInputStream::new(),
@ -43,7 +43,7 @@ pub fn read_all_from_stream_async(
bytes: (usize, usize, usize),
callback: (
impl Fn((Bytes, usize)) + 'static,
impl FnOnce(Result<MemoryInputStream, (Error, Option<&str>)>) + 'static,
impl FnOnce(Result<MemoryInputStream, Error>) + 'static,
),
) {
let (on_chunk, on_complete) = callback;
@ -63,7 +63,7 @@ pub fn read_all_from_stream_async(
// Validate max size
if bytes_total > bytes_total_limit {
return on_complete(Err((Error::BytesTotal, None)));
return on_complete(Err(Error::BytesTotal(bytes_total, bytes_total_limit)));
}
// No bytes were read, end of stream
@ -85,7 +85,7 @@ pub fn read_all_from_stream_async(
);
}
Err(reason) => {
on_complete(Err((Error::InputStream, Some(reason.message()))));
on_complete(Err(Error::InputStream(reason)));
}
},
);

View file

@ -1,5 +1,20 @@
use std::fmt::{Display, Formatter, Result};
#[derive(Debug)]
pub enum Error {
BytesTotal,
InputStream,
BytesTotal(usize, usize),
InputStream(glib::Error),
}
impl Display for Error {
fn fmt(&self, f: &mut Formatter) -> Result {
match self {
Self::BytesTotal(total, limit) => {
write!(f, "Bytes total limit reached: {total} / {limit}")
}
Self::InputStream(reason) => {
write!(f, "Input stream error: {reason}")
}
}
}
}