From dacbf5edb310c6d296861e1dba53821709a0a5a2 Mon Sep 17 00:00:00 2001
From: Dude so hot <djohn@fbi.gov>
Date: Wed, 30 Oct 2024 18:39:52 +0800
Subject: [PATCH] Fix thumb extension for webp

---
 .../com/hippo/ehviewer/coil/DownloadThumbInterceptor.kt       | 1 -
 app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt     | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/coil/DownloadThumbInterceptor.kt b/app/src/main/kotlin/com/hippo/ehviewer/coil/DownloadThumbInterceptor.kt
index 5f7232f58..c2e011c01 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/coil/DownloadThumbInterceptor.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/coil/DownloadThumbInterceptor.kt
@@ -7,7 +7,6 @@ import coil3.request.ImageRequest
 import coil3.request.ImageResult
 import coil3.request.SuccessResult
 import com.hippo.ehviewer.EhApplication.Companion.imageCache
-import com.hippo.ehviewer.download.downloadLocation
 import com.hippo.ehviewer.util.sendTo
 import com.hippo.files.isDirectory
 import com.hippo.files.isFile
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt b/app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt
index 7b5ce38fe..66aeda6b1 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt
@@ -14,8 +14,10 @@ import com.hippo.ehviewer.download.downloadLocation
 fun ImageRequest.Builder.ehUrl(info: GalleryInfo) = apply {
     val key = info.thumbKey!!
     data(info.thumbUrl)
+    val format = info.thumbUrl.substringAfterLast('.', "")
+    check(format.isNotBlank())
     if (info is DownloadInfo && !info.dirname.isNullOrBlank()) {
-        downloadLocation(downloadLocation / info.dirname / "thumb.jpg")
+        downloadLocation(downloadLocation / info.dirname / "thumb.$format")
     }
     memoryCacheKey(key)
     diskCacheKey(key)