Merge branch 'master' into merge-keiyoushi

lib-multisrc/kemono/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 14
+baseVersionCode = 15

lib-multisrc/kemono/src/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt

@@ -233,8 +233,8 @@ open class Kemono(
         GET("$baseUrl/$apiPath${chapter.url}", headers)
 
     override fun pageListParse(response: Response): List<Page> {
-        val post: KemonoPostDto = response.parseAs()
-        return post.images.mapIndexed { i, path -> Page(i, imageUrl = baseUrl + path) }
+        val postData: KemonoPostDtoWrapped = response.parseAs()
+        return postData.post.images.mapIndexed { i, path -> Page(i, imageUrl = baseUrl + path) }
     }
 
     override fun imageRequest(page: Page): Request {

lib-multisrc/kemono/src/eu/kanade/tachiyomi/multisrc/kemono/KemonoDto.kt

@@ -51,6 +51,11 @@ class KemonoCreatorDto(
     }
 }
 
+@Serializable
+class KemonoPostDtoWrapped(
+    val post: KemonoPostDto,
+)
+
 @Serializable
 class KemonoPostDto(
     private val id: String,

src/all/batoto/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Bato.to'
     extClass = '.BatoToFactory'
-    extVersionCode = 41
+    extVersionCode = 42
     isNsfw = true
 }
 

src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt

@@ -323,7 +323,7 @@ open class BatoTo(
         return super.mangaDetailsRequest(manga)
     }
     private var titleRegex: Regex =
-        Regex("(?:\\([^()]*\\)|\\{[^{}]*\\}|\\[(?:(?!]).)*]|«[^»]*»|〘[^〙]*〙|「[^」]*」|『[^』]*』|≪[^≫]*≫|﹛[^﹜]*﹜|〖[^〖〗]*〗|𖤍.+?𖤍|《[^》]*》|/.+?|⌜.+?⌝)\\s*")
+        Regex("(?:\\([^()]*\\)|\\{[^{}]*\\}|\\[(?:(?!]).)*]|«[^»]*»|〘[^〙]*〙|「[^」]*」|『[^』]*』|≪[^≫]*≫|﹛[^﹜]*﹜|〖[^〖〗]*〗|𖤍.+?𖤍|《[^》]*》|⌜.+?⌝|⟨[^⟩]*⟩|/.+)")
 
     override fun mangaDetailsParse(document: Document): SManga {
         val infoElement = document.select("div#mainer div.container-fluid")

src/all/comickfun/build.gradle

@@ -2,7 +2,7 @@ ext {
     kmkVersionCode = 1
     extName = 'Comick'
     extClass = '.ComickFactory'
-    extVersionCode = 49
+    extVersionCode = 50
     isNsfw = true
 }
 

src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/Comick.kt

@@ -399,17 +399,16 @@ abstract class Comick(
             val coversUrl =
                 "$apiUrl/comic/${mangaData.comic.slug ?: mangaData.comic.hid}/covers?tachiyomi=true"
             val covers = client.newCall(GET(coversUrl)).execute()
-                .parseAs<Covers>().mdCovers.reversed().toMutableList()
-            if (covers.any { it.vol == "1" }) covers.retainAll { it.vol == "1" }
-            if (
-                covers.any { it.locale == comickLang.split('-').first() }
-            ) {
-                covers.retainAll { it.locale == comickLang.split('-').first() }
-            }
+                .parseAs<Covers>().mdCovers.reversed()
+            val firstVol = covers.filter { it.vol == "1" }.ifEmpty { covers }
+            val originalCovers = firstVol
+                .filter { mangaData.comic.isoLang.orEmpty().startsWith(it.locale.orEmpty()) }
+            val localCovers = firstVol
+                .filter { comickLang.startsWith(it.locale.orEmpty()) }
             return mangaData.toSManga(
                 includeMuTags = preferences.includeMuTags,
                 scorePosition = preferences.scorePosition,
-                covers = covers,
+                covers = localCovers.ifEmpty { originalCovers }.ifEmpty { firstVol },
                 groupTags = preferences.groupTags,
             )
         }
@@ -491,9 +490,10 @@ abstract class Comick(
             .map { it.toSChapter(mangaUrl) }
     }
 
-    private val publishedDateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.ENGLISH).apply {
-        timeZone = TimeZone.getTimeZone("UTC")
-    }
+    private val publishedDateFormat =
+        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.ENGLISH).apply {
+            timeZone = TimeZone.getTimeZone("UTC")
+        }
 
     override fun getChapterUrl(chapter: SChapter): String {
         return "$baseUrl${chapter.url}"

src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/Dto.kt

@@ -112,6 +112,7 @@ class Comic(
     @SerialName("md_comic_md_genres") val mdGenres: List<MdGenres>,
     @SerialName("mu_comics") val muGenres: MuComicCategories = MuComicCategories(emptyList()),
     @SerialName("bayesian_rating") val score: String? = null,
+    @SerialName("iso639_1") val isoLang: String? = null,
 ) {
     val origination = when (country) {
         "jp" -> Name("Manga")

src/en/flamecomics/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Flame Comics'
     extClass = '.FlameComics'
-    extVersionCode = 36
+    extVersionCode = 37
 }
 
 apply from: "$rootDir/common.gradle"

src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComics.kt

@@ -107,12 +107,9 @@ class FlameComics : HttpSource() {
                 SManga.create().apply {
                     title = seriesData.title
                     setUrlWithoutDomain(
-                        dataApiReqBuilder().apply {
-                            val seriesID =
-                                seriesData.series_id
+                        baseUrl.toHttpUrl().newBuilder().apply {
                             addPathSegment("series")
-                            addPathSegment("$seriesID.json")
-                            addQueryParameter("id", seriesData.series_id.toString())
+                            addPathSegment(seriesData.series_id.toString())
                         }.build().toString(),
                     )
                     thumbnail_url = imageApiUrlBuilder(
@@ -164,12 +161,11 @@ class FlameComics : HttpSource() {
                 )
             }
         }
-        var lastPage = page * 20
-        if (lastPage > manga.size) {
-            lastPage = manga.size
-        }
-        if (lastPage < 0) lastPage = 0
-        return MangasPage(manga.subList((page - 1) * 20, lastPage), lastPage < manga.size)
+
+        val itemsPerPage = 20
+        val startIndex = (page - 1) * itemsPerPage
+        val endIndex = minOf(page * itemsPerPage, manga.size)
+        return MangasPage(manga.subList(startIndex, endIndex), endIndex < manga.size)
     }
 
     override fun mangaDetailsRequest(manga: SManga): Request = GET(
@@ -199,6 +195,11 @@ class FlameComics : HttpSource() {
             }.build().toString() + "&w=640&q=75",
         )
         description = seriesData.description
+
+        genre = seriesData.tags?.let { tags ->
+            (listOf(seriesData.type) + tags).joinToString()
+        } ?: seriesData.type
+
         author = seriesData.author
         status = when (seriesData.status.lowercase()) {
             "ongoing" -> SManga.ONGOING
@@ -223,7 +224,7 @@ class FlameComics : HttpSource() {
                 chapter_number = chapter.chapter.toFloat()
                 date_upload = chapter.release_date * 1000
                 name = buildString {
-                    append("Chapter ${chapter.chapter.toInt()} ")
+                    append("Chapter ${chapter.chapter.toString().removeSuffix(".0")} ")
                     append(chapter.title ?: "")
                 }
             }

src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComicsDto.kt

@@ -2,11 +2,14 @@ package eu.kanade.tachiyomi.extension.en.flamecomics
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.Json
 
 @Serializable
 class NewBuildID(
@@ -70,6 +73,9 @@ class Series(
     val altTitles: String?,
     val description: String,
     val cover: String,
+    val type: String,
+    @Serializable(with = TagsListSerializer::class)
+    val tags: List<String>?,
     val author: String?,
     val status: String,
     val series_id: Int,
@@ -101,3 +107,14 @@ class KeysToListSerializer : KSerializer<List<Page>> {
 
     override fun serialize(encoder: Encoder, value: List<Page>) {}
 }
+
+class TagsListSerializer : KSerializer<List<String>> {
+    private val listSer = ListSerializer(String.serializer())
+    override val descriptor: SerialDescriptor = listSer.descriptor
+    override fun deserialize(decoder: Decoder): List<String> {
+        val jsonString = decoder.decodeString()
+        return Json.decodeFromString(jsonString)
+    }
+
+    override fun serialize(encoder: Encoder, value: List<String>) {}
+}

src/en/mangago/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Mangago'
     extClass = '.Mangago'
-    extVersionCode = 22
+    extVersionCode = 23
     isNsfw = true
 }
 

src/en/mangago/src/eu/kanade/tachiyomi/extension/en/mangago/Mangago.kt

@@ -171,7 +171,7 @@ class Mangago : ParsedHttpSource(), ConfigurableSource {
     override fun searchMangaNextPageSelector() = genreListingNextPageSelector
 
     private var titleRegex: Regex =
-        Regex("(?:\\([^()]*\\)|\\{[^{}]*\\}|\\[(?:(?!]).)*]|«[^»]*»|〘[^〙]*〙|「[^」]*」|『[^』]*』|≪[^≫]*≫|﹛[^﹜]*﹜|〖[^〖〗]*〗|𖤍.+?𖤍|《[^》]*》|/.+?|⌜.+?⌝)\\s*")
+        Regex("(?:\\([^()]*\\)|\\{[^{}]*\\}|\\[(?:(?!]).)*]|«[^»]*»|〘[^〙]*〙|「[^」]*」|『[^』]*』|≪[^≫]*≫|﹛[^﹜]*﹜|〖[^〖〗]*〗|𖤍.+?𖤍|《[^》]*》|⌜.+?⌝|⟨[^⟩]*⟩|/.+)")
 
     override fun mangaDetailsParse(document: Document) = SManga.create().apply {
         title = document.selectFirst(".w-title h1")!!.text()