stephenseo/mpd_info_screen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Impl better handling of unknown image type

Browse source
This commit is contained in:
Stephen Seo 2022-10-30 17:54:33 +09:00
parent ce45a40df5
commit a1fe8c3120
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/display.rs
View file

@ -8,6 +8,7 @@ use ggez::graphics::{
}; };
use ggez::{timer, Context, GameError, GameResult}; use ggez::{timer, Context, GameError, GameResult};
use image::io::Reader as ImageReader; use image::io::Reader as ImageReader;
use image::DynamicImage;
use std::io::Cursor; use std::io::Cursor;
use std::path::PathBuf; use std::path::PathBuf;
use std::sync::atomic::AtomicBool; use std::sync::atomic::AtomicBool;
@ -398,10 +399,11 @@ impl MPDDisplay {
} }
let img_result = if is_unknown_format { let img_result = if is_unknown_format {
let mut reader = ImageReader::new(Cursor::new(&image_ref)); let reader = ImageReader::new(Cursor::new(image_ref));
reader = reader let guessed_reader = reader
.with_guessed_format() .with_guessed_format()
.map_err(|e| format!("Error: Failed to guess format of album art image: {}", e))?; .map_err(|e| format!("Error: Failed to guess format of album art image: {}", e));
if let Ok(reader) = guessed_reader {
reader.decode().map_err(|e| { reader.decode().map_err(|e| {
format!( format!(
"Error: Failed to decode album art image (guessed format): {}", "Error: Failed to decode album art image (guessed format): {}",
@ -409,7 +411,12 @@ impl MPDDisplay {
) )
}) })
} else { } else {
ImageReader::with_format(Cursor::new(&image_ref), image_format) // Convert Ok(_) to Ok(DynamicImage) which will never be used since the if statement
// covers it.
guessed_reader.map(|_| DynamicImage::default())
}
} else {
ImageReader::with_format(Cursor::new(image_ref), image_format)
.decode() .decode()
.map_err(|e| format!("Error: Failed to decode album art image: {}", e)) .map_err(|e| format!("Error: Failed to decode album art image: {}", e))
}; };