From 8ae2e840a7bb0ed8dfb16ac874e285996bce0feb Mon Sep 17 00:00:00 2001
From: storytellerF <34095089+storytellerF@users.noreply.github.com>
Date: Mon, 17 Feb 2025 10:20:23 +0800
Subject: [PATCH] fix: get dimension failed

---
 .../media/FileSystemMediaService.kt             | 17 +----------------
 .../com/storyteller_f/media/MediaService.kt     |  2 +-
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/kotlin/com/storyteller_f/media/FileSystemMediaService.kt b/backend/src/main/kotlin/com/storyteller_f/media/FileSystemMediaService.kt
index 5ef8fe2..33ca1df 100644
--- a/backend/src/main/kotlin/com/storyteller_f/media/FileSystemMediaService.kt
+++ b/backend/src/main/kotlin/com/storyteller_f/media/FileSystemMediaService.kt
@@ -1,8 +1,5 @@
 package com.storyteller_f.media
 
-import com.ashampoo.kim.common.convertToPhotoMetadata
-import com.ashampoo.kim.jvm.KimJvm
-import com.storyteller_f.shared.model.Dimension
 import com.storyteller_f.shared.model.MediaInfo
 import com.storyteller_f.shared.model.MediaItem
 import io.github.aakira.napier.Napier
@@ -63,7 +60,7 @@ class FileSystemMediaService(private val url: String, base: String) : MediaServi
                     val file = File(root, "$bucketName/$it")
                     if (file.exists()) {
                         val item = stat(it, file)
-                        val dimension = getDimension(file)
+                        val dimension = getDimension(file, item.contentType)
                         MediaInfo("${url}amedia/$it", item, dimension)
                     } else {
                         null
@@ -73,18 +70,6 @@ class FileSystemMediaService(private val url: String, base: String) : MediaServi
         })
     }
 
-    private fun getDimension(
-        file: File
-    ) = KimJvm.readMetadata(file)?.convertToPhotoMetadata()?.let {
-        val width = it.widthPx
-        val height = it.heightPx
-        if (width != null && height != null) {
-            Dimension(width, height)
-        } else {
-            null
-        }
-    }
-
     private fun stat(it: String, file: File): MediaItem {
         val contentType = kotlin.runCatching {
             tika.detect(file)
diff --git a/backend/src/main/kotlin/com/storyteller_f/media/MediaService.kt b/backend/src/main/kotlin/com/storyteller_f/media/MediaService.kt
index a508c75..443cbf0 100644
--- a/backend/src/main/kotlin/com/storyteller_f/media/MediaService.kt
+++ b/backend/src/main/kotlin/com/storyteller_f/media/MediaService.kt
@@ -75,7 +75,7 @@ fun loadAvif() {
     }
 }
 
-private fun getDimension(
+fun getDimension(
     file: File,
     contentType: String
 ): Dimension? {