metadata: Centralize many loose ends

src/metadata/format.rs

@@ -1,51 +0,0 @@
-// Copyright (c) 2023 Sophie Herold
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-use crate::util::gettext::*;
-
-#[derive(Clone, Debug)]
-pub struct ImageFormat {
-    mime_type: glycin::MimeType,
-    name: Option<String>,
-}
-
-impl ImageFormat {
-    pub fn new(mime_type: glycin::MimeType, name: Option<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.clone().unwrap_or_else(|| gettext("Unknown"))
-        )
-    }
-}

src/metadata/mod.rs

@@ -1,4 +1,4 @@
-// Copyright (c) 2022-2023 Sophie Herold
+// Copyright (c) 2022-2024 Sophie Herold
 // Copyright (c) 2023 FineFindus
 //
 // This program is free software: you can redistribute it and/or modify
@@ -22,11 +22,10 @@
 */
 
 mod file;
-mod format;
 mod gps;
 
 pub use file::FileInfo;
-pub use format::ImageFormat;
+use glycin_utils::{FrameDetails, ImageInfoDetails};
 pub use gps::GPSLocation;
 
 use crate::deps::*;
@@ -35,10 +34,12 @@ use crate::util::gettext::*;
 
 #[derive(Default)]
 pub struct Metadata {
+    mime_type: Option<String>,
     exif: Option<exif::Exif>,
     file_info: Option<FileInfo>,
-    format: Option<ImageFormat>,
-    transformations_applied: Option<bool>,
+    // TODO: Replace with glycin in newer glycin version
+    image_info: Option<glycin_utils::ImageInfoDetails>,
+    frame_info: Option<FrameDetails>,
 }
 
 impl std::fmt::Debug for Metadata {
@@ -62,7 +63,7 @@ impl std::fmt::Debug for Metadata {
 }
 
 impl Metadata {
-    pub fn set_exif_bytes(&mut self, bytes: Vec<u8>) {
+    fn set_exif_bytes(&mut self, bytes: Vec<u8>) {
         let reader = exif::Reader::new();
         let exif = reader.read_raw(bytes);
 
@@ -73,16 +74,23 @@ impl Metadata {
         self.exif = exif.ok();
     }
 
-    pub fn set_transformations_applied(&mut self, applied: bool) {
-        self.transformations_applied = Some(applied);
+    pub fn set_image_info(&mut self, image_info: ImageInfoDetails) {
+        if let Some(exif_raw) = image_info.exif.as_ref() {
+            self.set_exif_bytes(exif_raw.clone());
+        }
+        self.image_info = Some(image_info);
+    }
+
+    pub fn set_frame_info(&mut self, frame_info: FrameDetails) {
+        self.frame_info = Some(frame_info);
     }
 
     pub fn set_file_info(&mut self, file_info: FileInfo) {
         self.file_info = Some(file_info);
     }
 
-    pub fn set_format(&mut self, format: ImageFormat) {
-        self.format = Some(format);
+    pub fn set_mime_type(&mut self, mime_type: String) {
+        self.mime_type = Some(mime_type);
     }
 
     pub fn merge(&mut self, other: Self) {
@@ -92,8 +100,14 @@ impl Metadata {
         if self.file_info.is_none() {
             self.file_info = other.file_info;
         }
-        if self.transformations_applied.is_none() {
-            self.transformations_applied = other.transformations_applied;
+        if self.image_info.is_none() {
+            self.image_info = other.image_info;
+        }
+        if self.mime_type.is_none() {
+            self.mime_type = other.mime_type;
+        }
+        if self.frame_info.is_none() {
+            self.frame_info = other.frame_info;
         }
     }
 
@@ -104,18 +118,42 @@ impl Metadata {
             .map(|x| x.to_string())
     }
 
-    pub fn format(&self) -> Option<&ImageFormat> {
-        self.format.as_ref()
-    }
-
     pub fn format_name(&self) -> Option<String> {
-        self.format()
-            .map(|x| x.to_string())
+        self.image_info
+            .as_ref()
+            .and_then(|x| x.format_name.clone())
             .or_else(|| self.mime_type())
     }
 
+    pub fn alpha_channel(&self) -> Option<bool> {
+        self.frame_info.as_ref().and_then(|x| x.alpha_channel)
+    }
+
+    pub fn grayscale(&self) -> Option<bool> {
+        self.frame_info.as_ref().and_then(|x| x.grayscale)
+    }
+
+    pub fn bit_depth(&self) -> Option<u8> {
+        self.frame_info.as_ref().and_then(|x| x.bit_depth)
+    }
+
+    pub fn is_svg(&self) -> bool {
+        matches!(
+            self.mime_type.as_deref(),
+            Some("image/svg+xml") | Some("image/svg+xml-compressed")
+        )
+    }
+
+    pub fn is_potentially_transparent(&self) -> bool {
+        // TODO: Implement again
+        true
+    }
+
     pub fn transformations_applied(&self) -> bool {
-        self.transformations_applied.unwrap_or(false)
+        self.image_info
+            .as_ref()
+            .map(|x| x.transformations_applied)
+            .unwrap_or(false)
     }
 
     pub fn orientation(&self) -> Orientation {
@@ -136,6 +174,16 @@ impl Metadata {
         }
     }
 
+    pub fn dimensions_inch(&self) -> Option<(f64, f64)> {
+        self.image_info.as_ref().and_then(|x| x.dimensions_inch)
+    }
+
+    pub fn dimensions_text(&self) -> Option<String> {
+        self.image_info
+            .as_ref()
+            .and_then(|x| x.dimensions_text.clone())
+    }
+
     pub fn file_name(&self) -> Option<String> {
         self.file_info.as_ref().map(|x| x.display_name.to_string())
     }
@@ -210,7 +258,7 @@ impl Metadata {
                 let exposure = format!("{:.0}", 1. / rational.first()?.to_f32());
 
                 // Translators: Unit for exposure time in seconds
-                return Some(gettext_f("1\u{2215}{}\u{202F}s", &[&exposure]));
+                return Some(gettext_f("1\u{2215}{}\u{202F}s", [exposure]));
             }
         }
 
@@ -235,7 +283,7 @@ impl Metadata {
             if let exif::Value::Rational(rational) = &field.value {
                 let length = format!("{:.0}", rational.first()?.to_f32());
                 // Translators: Unit for focal length in millimeters
-                return Some(gettext_f("{}\u{202F}mm", &[&length]));
+                return Some(gettext_f("{}\u{202F}mm", [length]));
             }
         }