lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

image: Unify error handling in one type

Browse source
This commit is contained in:
Sophie Herold 2025-12-21 15:16:11 +01:00
parent 1d617bc4b2
commit b9668c7262
8 changed files with 108 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/decoder.rs
View file

@ -59,15 +59,10 @@ pub enum DecoderUpdate {
Redraw,
/// Start animation
Animated,
SpecificError(DecoderError),
/// And error occurred during decoding
GenericError(anyhow::Error),
Error(DecoderError),
}
#[derive(glib::Enum, Debug, Clone, Copy, Default, PartialEq, Eq)]
#[enum_type(name = "LpDecoderError")]
//#[enum_dynamic(lazy_registration = true)]
#[repr(i32)]
#[derive(Debug, Clone, Default, PartialEq, Eq)]
pub enum DecoderError {
/// Image format not supported or unknown
UnsupportedFormat,
@ -75,26 +70,23 @@ pub enum DecoderError {
NoLoadersConfigured,
/// Memory limit exceeded
OutOfMemory,
Generic(String),
//ImageSource(String),
#[default]
None,
}
impl DecoderError {
pub fn is_err(self) -> bool {
pub fn is_err(&self) -> bool {
matches!(self, Self::None)
}
pub fn is_ok(self) -> bool {
pub fn is_ok(&self) -> bool {
!matches!(self, Self::None)
}
}
impl glib::value::ToValueOptional for DecoderError {
fn to_value_optional(s: Option<&Self>) -> glib::Value {
s.unwrap_or(&Self::None).into()
}
}
impl UpdateSender {
pub fn send(&self, update: DecoderUpdate) {
let result = self.sender.force_send(update);
@ -124,23 +116,20 @@ impl UpdateSender {
}
pub fn send_error(&self, err: glycin::ErrorCtx) {
dbg!(&err);
if let Some(mime_type) = err.unsupported_format() {
let mut metadata = Metadata::default();
metadata.set_mime_type(mime_type);
self.send(DecoderUpdate::Metadata(Box::new(metadata)));
self.send(DecoderUpdate::SpecificError(
DecoderError::UnsupportedFormat,
));
self.send(DecoderUpdate::Error(DecoderError::UnsupportedFormat));
}
if err.is_out_of_memory() {
self.send(DecoderUpdate::SpecificError(DecoderError::OutOfMemory));
self.send(DecoderUpdate::Error(DecoderError::OutOfMemory));
} else if matches!(err.error(), glycin::Error::NoLoadersConfigured(_)) {
self.send(DecoderUpdate::SpecificError(
DecoderError::NoLoadersConfigured,
));
self.send(DecoderUpdate::Error(DecoderError::NoLoadersConfigured));
}
self.send(DecoderUpdate::GenericError(err.into()));
self.send(DecoderUpdate::Error(DecoderError::Generic(err.to_string())));
}
}
@ -220,7 +209,8 @@ impl Decoder {
pub fn request(&self, tile_request: TileRequest) {
if let FormatDecoder::Svg(svg) = &self.decoder {
if let Err(err) = svg.request(tile_request) {
self.update_sender.send(DecoderUpdate::GenericError(err));
self.update_sender
.send(DecoderUpdate::Error(DecoderError::Generic(err.to_string())));
}
}
}