diff --git a/src/en/spyfakku/build.gradle b/src/en/spyfakku/build.gradle index abe4b9035..2a76a52c4 100644 --- a/src/en/spyfakku/build.gradle +++ b/src/en/spyfakku/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'SpyFakku' extClass = '.SpyFakku' - extVersionCode = 3 + extVersionCode = 4 isNsfw = true } diff --git a/src/en/spyfakku/src/eu/kanade/tachiyomi/extension/en/spyfakku/SpyFakku.kt b/src/en/spyfakku/src/eu/kanade/tachiyomi/extension/en/spyfakku/SpyFakku.kt index 8ba00b4f8..3d106dfdc 100644 --- a/src/en/spyfakku/src/eu/kanade/tachiyomi/extension/en/spyfakku/SpyFakku.kt +++ b/src/en/spyfakku/src/eu/kanade/tachiyomi/extension/en/spyfakku/SpyFakku.kt @@ -11,6 +11,14 @@ import eu.kanade.tachiyomi.source.model.UpdateStrategy import eu.kanade.tachiyomi.source.online.HttpSource import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.contentOrNull +import kotlinx.serialization.json.decodeFromJsonElement +import kotlinx.serialization.json.int +import kotlinx.serialization.json.jsonArray +import kotlinx.serialization.json.jsonObject +import kotlinx.serialization.json.jsonPrimitive +import kotlinx.serialization.json.long import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.Request import okhttp3.Response @@ -24,11 +32,11 @@ class SpyFakku : HttpSource() { override val name = "SpyFakku" - override val baseUrl = "https://fakku.cc" + override val baseUrl = "https://w1.fakku.cc" - private val baseImageUrl = "https://cdn.fakku.cc/image" + private val baseImageUrl = "https://i1.fakku.cc/image" - private val baseApiUrl = "$baseUrl/api" + private val baseApiEnd = "/__data.json" override val lang = "en" @@ -45,28 +53,77 @@ class SpyFakku : HttpSource() { .set("Origin", baseUrl) override fun popularMangaRequest(page: Int): Request { - return GET("$baseApiUrl/library?sort=released_at&page=$page", headers) + return GET("$baseUrl$baseApiEnd?sort=released_at&page=$page", headers) } override fun popularMangaParse(response: Response): MangasPage { val library = response.parseAs() + val data = getMangasDatas(library.data) - val mangas = library.archives.map(::popularManga) + val mangas = data.first.map(::popularManga) - val hasNextPage = library.archives.isNotEmpty() + val hasNextPage = data.second return MangasPage(mangas, hasNextPage) } + private fun getMangasDatas(data: List): Pair, Boolean> { + val indexes = json.decodeFromJsonElement(data[0].jsonObject) + val indexesIndexes = json.decodeFromJsonElement>(data[indexes.archives]) + val hasNext = (data[indexes.page].jsonPrimitive.int * 24) < data[indexes.total].jsonPrimitive.int + + return indexesIndexes.map { + val hentaiIndexes = json.decodeFromJsonElement(data[it]) + val id = data[hentaiIndexes.id].jsonPrimitive.content + val hash = data[hentaiIndexes.hash].jsonPrimitive.content + val title = data[hentaiIndexes.title].jsonPrimitive.content + + ShortHentai(id, hash, title) + } to hasNext + } + + private fun getManga(data: List): Hentai { + fun getNameIndex(index: Int?, decode: (JsonElement) -> T): List? { + return index?.let { idx -> + data[idx].jsonArray.map { el -> decode(data[el.jsonPrimitive.int]) } + } + } + + fun JsonElement.toName(): String = this.jsonPrimitive.content.split(" ").joinToString(" ") { + it.lowercase().replaceFirstChar { char -> char.titlecase() } + } + + val hentaiIndexes = json.decodeFromJsonElement(data[0]) + val id = data[hentaiIndexes.id].jsonPrimitive.int + val hash = data[hentaiIndexes.hash].jsonPrimitive.content + val title = data[hentaiIndexes.title].jsonPrimitive.content + val description = data[hentaiIndexes.description].jsonPrimitive.contentOrNull + val released_at = data[hentaiIndexes.released_at].jsonPrimitive.content + val created_at = data[hentaiIndexes.created_at].jsonPrimitive.content + val pages = data[hentaiIndexes.pages].jsonPrimitive.int + val size = data[hentaiIndexes.size].jsonPrimitive.long + + val publishers = getNameIndex(hentaiIndexes.publishers) { data[json.decodeFromJsonElement(it).name].toName() } + val artists = getNameIndex(hentaiIndexes.artists) { data[json.decodeFromJsonElement(it).name].toName() } + val circles = getNameIndex(hentaiIndexes.circles) { data[json.decodeFromJsonElement(it).name].toName() } + val magazines = getNameIndex(hentaiIndexes.magazines) { data[json.decodeFromJsonElement(it).name].toName() } + val parodies = getNameIndex(hentaiIndexes.parodies) { data[json.decodeFromJsonElement(it).name].toName() } + val events = getNameIndex(hentaiIndexes.events) { data[json.decodeFromJsonElement(it).name].toName() } + val tags = getNameIndex(hentaiIndexes.tags) { data[json.decodeFromJsonElement(it).name].toName() } + val images = getNameIndex(hentaiIndexes.images) { data[json.decodeFromJsonElement(it).filename].toName() }!! + + return Hentai(id, hash, title, description, released_at, created_at, pages, size, publishers, artists, circles, magazines, parodies, events, tags, images) + } + private fun popularManga(hentai: ShortHentai) = SManga.create().apply { - setUrlWithoutDomain("$baseUrl/g/${hentai.id}") + setUrlWithoutDomain("$baseUrl/g/${hentai.id}" + baseApiEnd) title = hentai.title thumbnail_url = "$baseImageUrl/${hentai.hash}/1/c" } override fun searchMangaParse(response: Response) = popularMangaParse(response) override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { - val url = "$baseApiUrl/library".toHttpUrl().newBuilder().apply { + val url = "$baseUrl$baseApiEnd".toHttpUrl().newBuilder().apply { val terms = mutableListOf(query.trim()) filters.forEach { filter -> @@ -96,12 +153,12 @@ class SpyFakku : HttpSource() { override fun mangaDetailsRequest(manga: SManga): Request { manga.url = Regex("^/archive/(\\d+)/.*").replace(manga.url) { "/g/${it.groupValues[1]}" } - return GET(baseApiUrl + manga.url, headers) + return GET(baseUrl + manga.url, headers) } override fun pageListRequest(chapter: SChapter): Request { chapter.url = Regex("^/archive/(\\d+)/.*").replace(chapter.url) { "/g/${it.groupValues[1]}" } - return GET(baseApiUrl + chapter.url, headers) + return GET(baseUrl + chapter.url, headers) } override fun getFilterList() = getFilters() @@ -110,34 +167,34 @@ class SpyFakku : HttpSource() { private val releasedAtFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ENGLISH).apply { timeZone = TimeZone.getTimeZone("UTC") } - private val createdAtFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ENGLISH).apply { + private val createdAtFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS", Locale.ENGLISH).apply { timeZone = TimeZone.getTimeZone("UTC") } private fun Hentai.toSManga() = SManga.create().apply { title = this@toSManga.title url = "/g/$id" - author = (circles?.emptyToNull() ?: artists)?.joinToString { it.name } - artist = artists?.joinToString { it.name } - genre = tags?.joinToString { it.name } + author = (circles?.emptyToNull() ?: artists)?.joinToString() + artist = artists?.joinToString() + genre = tags?.joinToString() thumbnail_url = "$baseImageUrl/$hash/1/c" description = buildString { this@toSManga.description?.let { append(this@toSManga.description, "\n\n") } - circles?.emptyToNull()?.joinToString { it.name }?.let { + circles?.emptyToNull()?.joinToString()?.let { append("Circles: ", it, "\n") } - publishers?.emptyToNull()?.joinToString { it.name }?.let { + publishers?.emptyToNull()?.joinToString()?.let { append("Publishers: ", it, "\n") } - magazines?.emptyToNull()?.joinToString { it.name }?.let { + magazines?.emptyToNull()?.joinToString()?.let { append("Magazines: ", it, "\n") } - events?.emptyToNull()?.joinToString { it.name }?.let { + events?.emptyToNull()?.joinToString()?.let { append("Events: ", it, "\n\n") } - parodies?.emptyToNull()?.joinToString { it.name }?.let { + parodies?.emptyToNull()?.joinToString()?.let { append("Parodies: ", it, "\n") } append("Pages: ", pages, "\n\n") @@ -169,7 +226,7 @@ class SpyFakku : HttpSource() { } override fun mangaDetailsParse(response: Response): SManga { - return response.parseAs().toSManga() + return getManga(response.parseAs().data).toSManga() } private fun Collection.emptyToNull(): Collection? { @@ -181,12 +238,12 @@ class SpyFakku : HttpSource() { override fun chapterListRequest(manga: SManga) = mangaDetailsRequest(manga) override fun chapterListParse(response: Response): List { - val hentai = response.parseAs() + val hentai = getManga(response.parseAs().data) return listOf( SChapter.create().apply { name = "Chapter" - url = "/g/${hentai.id}" + url = "/g/${hentai.id}" + baseApiEnd date_upload = try { releasedAtFormat.parse(hentai.released_at)!!.time } catch (e: Exception) { @@ -199,14 +256,14 @@ class SpyFakku : HttpSource() { override fun getChapterUrl(chapter: SChapter) = baseUrl + chapter.url override fun pageListParse(response: Response): List { - val hentai = response.parseAs() + val hentai = getManga(response.parseAs().data) val images = hentai.images return images.mapIndexed { index, it -> - Page(index, imageUrl = "$baseImageUrl/${hentai.hash}/${it.filename}") + Page(index, imageUrl = "$baseImageUrl/${hentai.hash}/$it") } } private inline fun Response.parseAs(): T { - return json.decodeFromString(body.string()) + return json.decodeFromString(body.string().substringAfter("\n")) } override fun imageUrlParse(response: Response): String = throw UnsupportedOperationException() diff --git a/src/en/spyfakku/src/eu/kanade/tachiyomi/extension/en/spyfakku/SpyFakkuDto.kt b/src/en/spyfakku/src/eu/kanade/tachiyomi/extension/en/spyfakku/SpyFakkuDto.kt index 731b4fecc..e53499f7f 100644 --- a/src/en/spyfakku/src/eu/kanade/tachiyomi/extension/en/spyfakku/SpyFakkuDto.kt +++ b/src/en/spyfakku/src/eu/kanade/tachiyomi/extension/en/spyfakku/SpyFakkuDto.kt @@ -1,10 +1,46 @@ package eu.kanade.tachiyomi.extension.en.spyfakku import kotlinx.serialization.Serializable +import kotlinx.serialization.json.JsonElement @Serializable class HentaiLib( - val archives: List, + val data: List, +) + +@Serializable +class Indexes( + val archives: Int, + val page: Int, + val limit: Int, + val total: Int, +) + +@Serializable +class ShortHentaiIndexes( + val id: Int, + val hash: Int, + val title: Int, +) + +@Serializable +class HentaiIndexes( + val id: Int, + val hash: Int, + val title: Int, + val description: Int, + val released_at: Int, + val created_at: Int, + val pages: Int, + val size: Int, + val publishers: Int?, + val artists: Int?, + val circles: Int?, + val magazines: Int?, + val parodies: Int?, + val events: Int?, + val tags: Int?, + val images: Int, ) @Serializable @@ -16,30 +52,30 @@ class Hentai( val released_at: String, val created_at: String, val pages: Int, - val size: Int = 0, - val publishers: List?, - val artists: List?, - val circles: List?, - val magazines: List?, - val parodies: List?, - val events: List?, - val tags: List?, - val images: List, + val size: Long = 0L, + val publishers: List?, + val artists: List?, + val circles: List?, + val magazines: List?, + val parodies: List?, + val events: List?, + val tags: List?, + val images: List, ) @Serializable class ShortHentai( - val id: Int, + val id: String, val hash: String, val title: String, ) @Serializable -class Image( - val filename: String, +class ImageIndex( + val filename: Int, ) @Serializable -class Name( - val name: String, +class NameIndex( + val name: Int, )