hitomi: handle gifs (#8398)

src/all/hitomi/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Hitomi'
     extClass = '.HitomiFactory'
-    extVersionCode = 38
+    extVersionCode = 39
     isNsfw = true
 }
 

src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/Hitomi.kt

@@ -20,7 +20,7 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okhttp3.CacheControl
 import okhttp3.Call
-import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.HttpUrl
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
@@ -52,7 +52,7 @@ class Hitomi(
     override val supportsLatest = true
 
     override val client = network.cloudflareClient.newBuilder()
-        .addInterceptor(::updateImageUrlInterceptor)
+        .addInterceptor(::imageUrlInterceptor)
         .apply {
             interceptors().add(0, ::streamResetRetry)
         }
@@ -491,18 +491,20 @@ class Hitomi(
         }.awaitAll().filterNotNull()
     }
 
-    private suspend fun Gallery.toSManga() = SManga.create().apply {
+    private fun Gallery.toSManga() = SManga.create().apply {
         title = this@toSManga.title
         url = galleryurl
         author = groups?.joinToString { it.formatted } ?: artists?.joinToString { it.formatted }
         artist = artists?.joinToString { it.formatted }
         genre = tags?.joinToString { it.formatted }
         thumbnail_url = files.first().let {
-            val hash = it.hash
+            HttpUrl.Builder().apply {
-            val imageId = imageIdFromHash(hash)
+                scheme("https")
-            val subDomain = 'a' + subdomainOffset(imageId)
+                host(IMAGE_LOOPBACK_HOST)
-
+                addQueryParameter(IMAGE_THUMBNAIL, "true")
-            "https://${subDomain}tn.$cdnDomain/avifbigtn/${thumbPathFromHash(hash)}/$hash.avif"
+                addQueryParameter(IMAGE_GIF, it.isGif.toString())
+                fragment(it.hash)
+            }.toString()
         }
         description = buildString {
             japaneseTitle?.let {
@@ -571,11 +573,13 @@ class Hitomi(
             .substringBefore(".")
 
         return gallery.files.mapIndexed { idx, img ->
-            // actual logic in updateImageUrlInterceptor
+            // actual logic in imageUrlInterceptor
-            val imageUrl = "http://127.0.0.1".toHttpUrl().newBuilder()
+            val imageUrl = HttpUrl.Builder().apply {
-                .fragment(img.hash)
+                scheme("https")
-                .build()
+                host(IMAGE_LOOPBACK_HOST)
-                .toString()
+                addQueryParameter(IMAGE_GIF, img.isGif.toString())
+                fragment(img.hash)
+            }.toString()
 
             Page(
                 idx,
@@ -677,18 +681,38 @@ class Hitomi(
         }
     }
 
-    private fun updateImageUrlInterceptor(chain: Interceptor.Chain): Response {
+    private fun imageUrlInterceptor(chain: Interceptor.Chain): Response {
         val request = chain.request()
-        if (request.url.host != "127.0.0.1") {
+        if (request.url.host != IMAGE_LOOPBACK_HOST) {
             return chain.proceed(request)
         }
 
         val hash = request.url.fragment!!
-        val commonId = runBlocking { commonImageId() }
+        val isThumbnail = request.url.queryParameter(IMAGE_THUMBNAIL) == "true"
-        val imageId = imageIdFromHash(hash)
+        val isGif = request.url.queryParameter(IMAGE_GIF) == "true"
-        val subDomain = runBlocking { (subdomainOffset(imageId) + 1) }
 
-        val imageUrl = "https://a$subDomain.$cdnDomain/$commonId$imageId/$hash.avif"
+        val type = if (isGif) {
+            "webp"
+        } else {
+            "avif"
+        }
+        val imageId = imageIdFromHash(hash)
+        val subDomainOffset = runBlocking { subdomainOffset(imageId) }
+
+        val imageUrl = if (isThumbnail) {
+            val subDomain = "${'a' + subDomainOffset}tn"
+
+            "https://$subDomain.$cdnDomain/${type}bigtn/${thumbPathFromHash(hash)}/$hash.$type"
+        } else {
+            val commonId = runBlocking { commonImageId() }
+            val subDomain = if (isGif) {
+                "w${subDomainOffset + 1}"
+            } else {
+                "a${subDomainOffset + 1}"
+            }
+
+            "https://$subDomain.$cdnDomain/$commonId$imageId/$hash.$type"
+        }
 
         val newRequest = request.newBuilder()
             .url(imageUrl)
@@ -705,3 +729,7 @@ class Hitomi(
     override fun searchMangaParse(response: Response) = throw UnsupportedOperationException()
     override fun imageUrlParse(response: Response) = throw UnsupportedOperationException()
 }
+
+const val IMAGE_LOOPBACK_HOST = "127.0.0.1"
+const val IMAGE_THUMBNAIL = "is_thumbnail"
+const val IMAGE_GIF = "is_gif"

src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/HitomiDto.kt

@@ -22,7 +22,10 @@ class Gallery(
 @Serializable
 class ImageFile(
     val hash: String,
-)
+    private val name: String,
+) {
+    val isGif get() = name.endsWith(".gif")
+}
 
 @Serializable
 class Tag(