🚧(icu_lib): refactor find endecoder function

icu_lib/src/endecoder/mod.rs

@@ -22,7 +22,7 @@ pub trait EnDecoder {
     fn info(&self, data: &[u8]) -> ImageInfo;
 }
 
-pub fn get_info(data: &[u8]) -> ImageInfo {
+pub fn find_endecoder(data: &[u8]) -> Option<&'static dyn EnDecoder> {
     let eds = vec![
         &endecoder::common::AutoDectect {} as &dyn EnDecoder,
         &endecoder::lvgl_v9::LVGL {} as &dyn EnDecoder,
@@ -31,9 +31,9 @@ pub fn get_info(data: &[u8]) -> ImageInfo {
     for ed in eds {
         let can_decode = ed.can_decode(data);
         if can_decode {
-            return ed.info(data);
+            return Some(ed);
         }
     }
 
-    panic!("No decoder found for this data")
+    None
 }

icu_lib/src/midata/mod.rs

@@ -18,19 +18,3 @@ impl MiData {
         ed.encode(self, encoder_params)
     }
 }
-
-pub fn decode_from(data: Vec<u8>) -> MiData {
-    let eds = vec![
-        &endecoder::common::AutoDectect {} as &dyn EnDecoder,
-        &endecoder::lvgl_v9::LVGL {} as &dyn EnDecoder,
-    ];
-
-    for ed in eds {
-        let can_decode = ed.can_decode(&data);
-        if can_decode {
-            return ed.decode(data);
-        }
-    }
-
-    panic!("No decoder found for this data")
-}

src/main.rs

@@ -5,23 +5,29 @@ use crate::arguments::{
     parse_args, ImageFormatCategory, ImageFormats, OutputFileFormatCategory, SubCommands,
 };
 use crate::image_shower::show_image;
-use icu_lib::endecoder::{common, get_info, lvgl_v9, EnDecoder};
-use icu_lib::midata::{decode_from, MiData};
+use icu_lib::endecoder::{common, find_endecoder, lvgl_v9, EnDecoder};
+use icu_lib::midata::MiData;
 use icu_lib::{endecoder, EncoderParams};
 use std::fs;
 use std::path::Path;
 
 fn decode_with(data: Vec<u8>, input_format: ImageFormatCategory) -> MiData {
     match input_format {
-        ImageFormatCategory::Auto => decode_from(data),
+        ImageFormatCategory::Auto => {
+            let ed = find_endecoder(&data);
+            ed.unwrap().decode(data)
+        }
         ImageFormatCategory::Common => MiData::decode_from(&common::AutoDectect {}, data),
         ImageFormatCategory::LVGL_V9 => MiData::decode_from(&lvgl_v9::LVGL {}, data),
     }
 }
 
 fn get_info_with(data: Vec<u8>, input_format: ImageFormatCategory) -> endecoder::ImageInfo {
     match input_format {
-        ImageFormatCategory::Auto => get_info(&data),
+        ImageFormatCategory::Auto => {
+            let ed = find_endecoder(&data);
+            ed.unwrap().info(&data)
+        }
         ImageFormatCategory::Common => common::AutoDectect {}.info(&data),
         ImageFormatCategory::LVGL_V9 => lvgl_v9::LVGL {}.info(&data),
     }