Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 21:06:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not ignore errors in try_calc_and_set_dimensions

Browse Source
This commit is contained in:
link2xt
2023-07-08 21:17:55 +00:00
parent 80fac3f1b8
commit 2fdb9f8b7e
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/message.rs
View File

@@ -583,14 +583,22 @@ impl Message {
if (self.viewtype == Viewtype::Image || self.viewtype == Viewtype::Gif) if (self.viewtype == Viewtype::Image || self.viewtype == Viewtype::Gif)
&& !self.param.exists(Param::Width) && !self.param.exists(Param::Width)
{ {
self.param.set_int(Param::Width, 0); let buf = read_file(context, &path_and_filename).await?;
self.param.set_int(Param::Height, 0);
if let Ok(buf) = read_file(context, path_and_filename).await { match get_filemeta(&buf) {
if let Ok((width, height)) = get_filemeta(&buf) { Ok((width, height)) => {
self.param.set_int(Param::Width, width as i32); self.param.set_int(Param::Width, width as i32);
self.param.set_int(Param::Height, height as i32); self.param.set_int(Param::Height, height as i32);
} }
Err(err) => {
self.param.set_int(Param::Width, 0);
self.param.set_int(Param::Height, 0);
warn!(
context,
"Failed to get width and height for {}: {err:#}.",
path_and_filename.display()
);
}
} }
if !self.id.is_unset() { if !self.id.is_unset() {