From a2a9b4134b650d80643d671ab53225f2559b23d4 Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Thu, 9 Mar 2023 22:10:08 +0100
Subject: [PATCH] propertiesView: Use decoder format

Use the format that we actually used when decoding.
The mime type is usually derived from the file extension
which might not always be correct.

Issue #43

Part-of: <https://gitlab.gnome.org/Incubator/loupe/-/merge_requests/132>
---
 data/gtk/properties_view.ui    |  8 ++++----
 src/decoder/formats/mod.rs     | 26 ++++++++++++++++++++++++++
 src/decoder/mod.rs             | 20 +-------------------
 src/widgets/image.rs           | 14 ++++++++++++--
 src/widgets/image_view.rs      |  2 +-
 src/widgets/properties_view.rs | 12 ------------
 6 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/data/gtk/properties_view.ui b/data/gtk/properties_view.ui
index ddfca20..5420327 100644
--- a/data/gtk/properties_view.ui
+++ b/data/gtk/properties_view.ui
@@ -68,12 +68,12 @@
                 </child>
                 <child>
                   <object class="AdwActionRow">
-                    <property name="title" translatable="yes">File Type</property>
+                    <property name="title" translatable="yes">Image Format</property>
                     <property name="subtitle-selectable">True</property>
                     <binding name="subtitle">
-                      <closure type="gchararray" function="file_type">
-                        <lookup name="file-info">LpPropertiesView</lookup>
-                      </closure>
+                      <lookup type="LpImage" name="format-name">
+                        <lookup type="LpPropertiesView" name="image"/>
+                      </lookup>
                     </binding>
                     <style>
                       <class name="property"/>
diff --git a/src/decoder/formats/mod.rs b/src/decoder/formats/mod.rs
index 83c2480..b4e0eec 100644
--- a/src/decoder/formats/mod.rs
+++ b/src/decoder/formats/mod.rs
@@ -7,3 +7,29 @@ pub use image_rs_other::ImageRsOther;
 pub use svg::{Svg, RSVG_MAX_SIZE};
 
 use super::{Decoder, UpdateSender};
+
+#[derive(Clone, Copy, Debug)]
+pub enum ImageFormat {
+    ImageRs(image_rs::ImageFormat),
+    // TODO: Add details about contained format
+    Heif,
+    Svg,
+}
+
+impl std::fmt::Display for ImageFormat {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+        match self {
+            Self::ImageRs(format) => {
+                let debug = format!("{:?}", format);
+                if debug.len() <= 4 {
+                    // uppercase abbreviations
+                    write!(f, "{}", debug.to_uppercase())
+                } else {
+                    write!(f, "{}", debug)
+                }
+            }
+            Self::Heif => write!(f, "HEIF Container"),
+            Self::Svg => write!(f, "SVG"),
+        }
+    }
+}
diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs
index deac114..c0d4f31 100644
--- a/src/decoder/mod.rs
+++ b/src/decoder/mod.rs
@@ -15,25 +15,7 @@ use gtk::graphene;
 use std::io::Read;
 use std::sync::Arc;
 
-pub use formats::RSVG_MAX_SIZE;
-
-#[derive(Clone, Copy, Debug)]
-pub enum ImageFormat {
-    ImageRs(image_rs::ImageFormat),
-    // TODO: Add details about contained format
-    Heif,
-    Svg,
-}
-
-impl std::fmt::Display for ImageFormat {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
-        match self {
-            Self::ImageRs(format) => write!(f, "{:?}", format),
-            Self::Heif => write!(f, "HEIF"),
-            Self::Svg => write!(f, "SVG"),
-        }
-    }
-}
+pub use formats::{ImageFormat, RSVG_MAX_SIZE};
 
 #[derive(Clone, Copy, Debug)]
 /// Renderer requests new tiles
diff --git a/src/widgets/image.rs b/src/widgets/image.rs
index f8feaa5..52b21ca 100644
--- a/src/widgets/image.rs
+++ b/src/widgets/image.rs
@@ -165,10 +165,13 @@ mod imp {
                     glib::ParamSpecBoolean::builder("is-loaded")
                         .read_only()
                         .build(),
-                    glib::ParamSpecBoolean::builder("error").read_only().build(),
+                    glib::ParamSpecString::builder("error").read_only().build(),
                     glib::ParamSpecObject::builder::<LpImageMetadata>("metadata")
                         .read_only()
                         .build(),
+                    glib::ParamSpecString::builder("format-name")
+                        .read_only()
+                        .build(),
                     glib::ParamSpecDouble::builder("rotation")
                         .explicit_notify()
                         .build(),
@@ -206,6 +209,7 @@ mod imp {
                 "is-loaded" => obj.is_loaded().to_value(),
                 "error" => obj.error().to_value(),
                 "metadata" => obj.metadata().to_value(),
+                "format-name" => obj.format_name().to_value(),
                 "rotation" => obj.rotation().to_value(),
                 "mirrored" => obj.mirrored().to_value(),
                 "zoom" => obj.zoom().to_value(),
@@ -713,6 +717,7 @@ impl LpImage {
             }
             DecoderUpdate::Format(format) => {
                 imp.format.replace(Some(format));
+                self.notify("format-name");
             }
         }
     }
@@ -964,7 +969,7 @@ impl LpImage {
 
     /// Maximal zoom allowed for this image
     fn max_zoom(&self) -> f64 {
-        if let Some(decoder::ImageFormat::Svg) = dbg!(self.format()) {
+        if let Some(decoder::ImageFormat::Svg) = self.format() {
             let (width, height) = self.original_dimensions();
             // Avoid division by 0
             let long_side = f64::max(1., i32::max(width, height) as f64);
@@ -1435,6 +1440,11 @@ impl LpImage {
         *self.imp().format.borrow()
     }
 
+    /// Image format displayable name
+    pub fn format_name(&self) -> Option<String> {
+        self.imp().format.borrow().map(|x| x.to_string())
+    }
+
     /// Returns decoding error if one occured
     pub fn error(&self) -> Option<String> {
         self.imp().error.borrow().clone()
diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs
index 6c2b9ee..1c9d73c 100644
--- a/src/widgets/image_view.rs
+++ b/src/widgets/image_view.rs
@@ -247,7 +247,7 @@ impl LpImageView {
     pub fn set_image_from_path(&self, path: &Path) {
         // Add image to recently used file. Does not work in Flatpaks:
         // <https://github.com/flatpak/xdg-desktop-portal/issues/215>
-        gtk::RecentManager::default().add_item(&dbg!(gio::File::for_path(path).uri()));
+        gtk::RecentManager::default().add_item(&gio::File::for_path(path).uri());
 
         if let Err(err) = self.load_path(path) {
             log::error!("Failed to load path: {err}");
diff --git a/src/widgets/properties_view.rs b/src/widgets/properties_view.rs
index ed58dac..1e4bd66 100644
--- a/src/widgets/properties_view.rs
+++ b/src/widgets/properties_view.rs
@@ -380,18 +380,6 @@ impl LpPropertiesView {
             .unwrap_or_else(|| FALLBACK.to_owned()) // and if we get nothing, use `FALLBACK`
     }
 
-    #[template_callback]
-    fn file_type(&self, info: Option<gio::FileInfo>) -> String {
-        info.and_then(|i| i.content_type())
-            .map(|t| t.to_string())
-            .map(|t| {
-                t.rsplit('/').collect::<Vec<&str>>()[0]
-                    .to_owned()
-                    .to_uppercase()
-            })
-            .unwrap_or_else(|| FALLBACK.to_owned())
-    }
-
     #[template_callback]
     fn file_size(&self, info: Option<gio::FileInfo>) -> String {
         info.map(|info| {