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

imagePage: Show specific error for out of memory

Browse source 
Part-of: <https://gitlab.gnome.org/GNOME/loupe/-/merge_requests/435>
This commit is contained in:
Sophie Herold 2024-07-26 22:54:24 +02:00 • committed by Marge Bot
parent 9bd68cd8dd
commit b33943fbe2
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -915,7 +915,7 @@ dependencies = [
[[package]] [[package]]
name = "glycin" name = "glycin"
version = "2.0.0-alpha" version = "2.0.0-alpha"
source = "git+https://gitlab.gnome.org/sophie-h/glycin#d54af1730281c21982846d6729c22dc21265cb0d" source = "git+https://gitlab.gnome.org/sophie-h/glycin#dba036d37a7991215222b68f3527b4740f10953b"
dependencies = [ dependencies = [
"async-fs", "async-fs",
"async-io", "async-io",
@ -946,7 +946,7 @@ dependencies = [
[[package]] [[package]]
name = "glycin-utils" name = "glycin-utils"
version = "2.0.0-alpha" version = "2.0.0-alpha"
source = "git+https://gitlab.gnome.org/sophie-h/glycin#d54af1730281c21982846d6729c22dc21265cb0d" source = "git+https://gitlab.gnome.org/sophie-h/glycin#dba036d37a7991215222b68f3527b4740f10953b"
dependencies = [ dependencies = [
"env_logger", "env_logger",
"gufo-common", "gufo-common",

5
src/decoder.rs
View file

@ -73,6 +73,8 @@ pub enum DecoderError {
UnsupportedFormat, UnsupportedFormat,
/// No glycin-loaders installed /// No glycin-loaders installed
NoLoadersConfigured, NoLoadersConfigured,
/// Memory limit exceeded
OutOfMemory,
#[default] #[default]
None, None,
} }
@ -118,6 +120,9 @@ impl UpdateSender {
update_sender.send(DecoderUpdate::SpecificError( update_sender.send(DecoderUpdate::SpecificError(
DecoderError::UnsupportedFormat, DecoderError::UnsupportedFormat,
)); ));
}
if err.is_out_of_memory() {
update_sender.send(DecoderUpdate::SpecificError(DecoderError::OutOfMemory));
} else if matches!(err.error(), glycin::Error::NoLoadersConfigured(_)) { } else if matches!(err.error(), glycin::Error::NoLoadersConfigured(_)) {
update_sender.send(DecoderUpdate::SpecificError( update_sender.send(DecoderUpdate::SpecificError(
DecoderError::NoLoadersConfigured, DecoderError::NoLoadersConfigured,

12
src/widgets/image_page.rs
View file

@ -261,9 +261,15 @@ impl LpImagePage {
} }
)); ));
imp.error_page.set_description(Some(&gettext( if image.specific_error() == DecoderError::OutOfMemory {
"Either the image file is corrupted or it contains unsupported elements.", imp.error_page.set_description(Some(&gettext(
))); "There is not enough free memory available to load this image.",
)));
} else {
imp.error_page.set_description(Some(&gettext(
"Either the image file is corrupted or it contains unsupported elements.",
)));
}
imp.error_more_info.set_visible(true); imp.error_more_info.set_visible(true);
imp.stack.set_visible_child(&*imp.error_page); imp.stack.set_visible_child(&*imp.error_page);