From 14397dd0379bad1026b71ed96a236dd04908e7c6 Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Mon, 15 Nov 2021 20:28:37 +0100
Subject: [PATCH] Change thumbnail requirements to be stricter

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 mediarepo-api/Cargo.toml                         | 2 +-
 mediarepo-api/src/tauri_plugin/custom_schemes.rs | 9 ++++++---
 mediarepo-api/src/types/files.rs                 | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mediarepo-api/Cargo.toml b/mediarepo-api/Cargo.toml
index 4793bf5..5eaf5f0 100644
--- a/mediarepo-api/Cargo.toml
+++ b/mediarepo-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mediarepo-api"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2018"
 license = "gpl-3"
 
diff --git a/mediarepo-api/src/tauri_plugin/custom_schemes.rs b/mediarepo-api/src/tauri_plugin/custom_schemes.rs
index 0200e79..0b8ef4a 100644
--- a/mediarepo-api/src/tauri_plugin/custom_schemes.rs
+++ b/mediarepo-api/src/tauri_plugin/custom_schemes.rs
@@ -97,11 +97,14 @@ fn thumb_scheme<R: Runtime>(app: &AppHandle<R>, request: &Request) -> Result<Res
             ((height as f32 * 0.8) as u32, (width as f32 * 0.8) as u32),
             ((height as f32 * 1.2) as u32, (width as f32 * 1.2) as u32),
         ))?;
-        let mime = thumb.mime_type.unwrap_or(String::from("image/png"));
-        buf_state.add_entry(request.uri().to_string(), mime.clone(), bytes.clone());
+        buf_state.add_entry(
+            request.uri().to_string(),
+            thumb.mime_type.clone(),
+            bytes.clone(),
+        );
 
         ResponseBuilder::new()
-            .mimetype(&mime)
+            .mimetype(&thumb.mime_type)
             .status(200)
             .body(bytes)
     }
diff --git a/mediarepo-api/src/types/files.rs b/mediarepo-api/src/types/files.rs
index ab27f11..6561002 100644
--- a/mediarepo-api/src/types/files.rs
+++ b/mediarepo-api/src/types/files.rs
@@ -92,9 +92,9 @@ pub struct FileOSMetadata {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ThumbnailMetadataResponse {
     pub file_id: i64,
-    pub height: i32,
-    pub width: i32,
-    pub mime_type: Option<String>,
+    pub height: u32,
+    pub width: u32,
+    pub mime_type: String,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]