MangaHub: Tweak rate limiting, fix decimal chapters (#10780)

* Fix chapters with decimals

* Tweak rate limiting to only apply on chapter images

This also fixes slow thumbnails

* up version

multisrc/overrides/mangahub/mangafoxfun/src/MangaFoxFun.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.mangafoxfun
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ class MangaFoxFun : MangaHub(
     "en"
 ) {
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .addInterceptor(SpecificHostRateLimitInterceptor(cdnHost, 1, 2))
         .build()
 
     override val serverId = "mf01"

multisrc/overrides/mangahub/mangahereonl/src/MangaHereOnl.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.mangahereonl
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ class MangaHereOnl : MangaHub(
     "en"
 ) {
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .addInterceptor(SpecificHostRateLimitInterceptor(cdnHost, 1, 2))
         .build()
 
     override val serverId = "mh01"

multisrc/overrides/mangahub/mangahubio/src/MangaHubIo.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.mangahubio
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ class MangaHubIo : MangaHub(
     "en"
 ) {
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .addInterceptor(SpecificHostRateLimitInterceptor(cdnHost, 1, 2))
         .build()
 
     override val serverId = "m01"

multisrc/overrides/mangahub/mangakakalotfun/src/MangakakalotFun.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.mangakakalotfun
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ class MangakakalotFun : MangaHub(
     "en"
 ) {
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .addInterceptor(SpecificHostRateLimitInterceptor(cdnHost, 1, 2))
         .build()
 
     override val serverId = "mn01"

multisrc/overrides/mangahub/manganel/src/MangaNel.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.manganel
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ class MangaNel : MangaHub(
     "en"
 ) {
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .addInterceptor(SpecificHostRateLimitInterceptor(cdnHost, 1, 2))
         .build()
 
     override val serverId = "mn05"

multisrc/overrides/mangahub/mangaonlinefun/src/MangaOnlineFun.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.mangaonlinefun
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ class MangaOnlineFun : MangaHub(
     "en"
 ) {
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .addInterceptor(SpecificHostRateLimitInterceptor(cdnHost, 1, 2))
         .build()
 
     override val serverId = "m02"

multisrc/overrides/mangahub/mangapandaonl/src/MangaPandaOnl.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.mangapandaonl
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ class MangaPandaOnl : MangaHub(
     "en"
 ) {
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .addInterceptor(SpecificHostRateLimitInterceptor(cdnHost, 1, 2))
         .build()
 
     override val serverId = "mr02"

multisrc/overrides/mangahub/mangareadersite/src/MangaReaderSite.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.mangareadersite
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ class MangaReaderSite : MangaHub(
     "en"
 ) {
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .addInterceptor(SpecificHostRateLimitInterceptor(cdnHost, 1, 2))
         .build()
 
     override val serverId = "mr01"

multisrc/overrides/mangahub/mangatoday/src/MangaToday.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.mangatoday
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ class MangaToday : MangaHub(
     "en"
 ) {
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .addInterceptor(SpecificHostRateLimitInterceptor(cdnHost, 1, 2))
         .build()
 
     override val serverId = "m03"

multisrc/overrides/mangahub/mangatownhub/src/MangaTownHub.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.mangatownhub
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ class MangaTownHub : MangaHub(
     "en"
 ) {
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .addInterceptor(SpecificHostRateLimitInterceptor(cdnHost, 1, 2))
         .build()
 
     override val serverId = "mt01"

multisrc/overrides/mangahub/onemangaco/src/OneMangaCo.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.onemangaco
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ class OneMangaCo : MangaHub(
     "en"
 ) {
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .addInterceptor(SpecificHostRateLimitInterceptor(cdnHost, 1, 2))
         .build()
 
     override val serverId = "mn03"

multisrc/overrides/mangahub/onemangainfo/src/OneMangaInfo.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.en.onemangainfo
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -11,7 +11,7 @@ class OneMangaInfo : MangaHub(
     "en"
 ) {
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .addInterceptor(SpecificHostRateLimitInterceptor(cdnHost, 1, 2))
         .build()
 
     override val serverId = "mn02"

multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangahub/MangaHub.kt

@@ -41,6 +41,8 @@ abstract class MangaHub(
 
     protected abstract val serverId: String
 
+    protected open val cdnHost = " https://img.mghubcdn.com/".toHttpUrl()
+
     // Popular
     override fun popularMangaRequest(page: Int): Request =
         GET("$baseUrl/popular/page/$page", headers)
@@ -367,7 +369,7 @@ data class ChapterInnerDto(
     val manga: MangaInnerDto,
     @SerialName("mangaID") val mangaId: Int,
     val noAd: Boolean,
-    val number: Int,
+    val number: Float,
     val pages: String,
     val slug: String,
     val title: String

multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangahub/MangaHubGenerator.kt

@@ -9,7 +9,7 @@ class MangaHubGenerator : ThemeSourceGenerator {
 
     override val themeClass = "MangaHub"
 
-    override val baseVersionCode: Int = 1
+    override val baseVersionCode: Int = 2
 
     override val sources = listOf(
         SingleLang("1Manga.co", "https://1manga.co", "en", isNsfw = true, className = "OneMangaCo"),