metadata: Move file info and format to metadata

src/decoder/formats/glycin_proxy.rs

@@ -19,7 +19,7 @@
 use super::*;
 use crate::decoder::tiling::{self, FrameBufferExt};
 use crate::deps::*;
-use crate::image_metadata::ImageMetadata;
+use crate::metadata::{ImageFormat, Metadata};
 
 use arc_swap::ArcSwap;
 use gtk::prelude::*;
@@ -62,8 +62,9 @@ impl Glycin {
             let image = image_request.request().await?;
 
             if let Some(exif_raw) = image.info().exif.clone().into() {
-                let mut metadata = ImageMetadata::from_exif_bytes(exif_raw);
-                metadata.heif_transform = image.info().transformations_applied;
+                let mut metadata = Metadata::default();
+                metadata.set_exif_bytes(exif_raw);
+                metadata.set_transformations_applied(image.info().transformations_applied);
                 updater.send(DecoderUpdate::Metadata(metadata));
             }
 

src/decoder/formats/mod.rs

@@ -23,35 +23,6 @@ pub use svg::{Svg, RSVG_MAX_SIZE};
 
 use super::{DecoderUpdate, UpdateSender};
 
-#[derive(Clone, Debug)]
-pub struct ImageFormat {
-    mime_type: glycin::MimeType,
-    name: String,
-}
-
-impl ImageFormat {
-    pub fn new(mime_type: glycin::MimeType, name: String) -> Self {
-        Self { mime_type, name }
-    }
-
-    pub fn is_svg(&self) -> bool {
-        matches!(
-            self.mime_type.as_str(),
-            "image/svg+xml" | "image/svg+xml-compressed"
-        )
-    }
-
-    pub fn is_potentially_transparent(&self) -> bool {
-        !matches!(self.mime_type.as_str(), "image/bmp" | "image/jpeg")
-    }
-}
-
-impl std::fmt::Display for ImageFormat {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
-        write!(f, "{}", self.name)
-    }
-}
-
 #[derive(Clone, Debug, Default)]
 pub enum ImageDimensionDetails {
     Svg(String),

src/decoder/formats/svg.rs

@@ -20,6 +20,7 @@ use super::*;
 use crate::decoder::tiling::{self, FrameBufferExt};
 use crate::decoder::TileRequest;
 use crate::deps::*;
+use crate::metadata::ImageFormat;
 
 use anyhow::Context;
 use arc_swap::ArcSwap;