[Nhentai World] Fix chapters list

dragonx943 1 year ago
parent a82e41aabb
commit dc7c859344

@ -8,13 +8,14 @@ import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.config.ConfigKey
import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser import org.koitharu.kotatsu.parsers.core.LegacyPagedMangaParser
import org.koitharu.kotatsu.parsers.exception.ParseException
import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.model.*
import org.koitharu.kotatsu.parsers.util.* import org.koitharu.kotatsu.parsers.util.*
import org.koitharu.kotatsu.parsers.util.json.getStringOrNull import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
@Broken // TODO @Broken // TODO: Fix tags
@MangaSourceParser("NHENTAIWORLD", "Nhentai World", "vi", ContentType.HENTAI) @MangaSourceParser("NHENTAIWORLD", "Nhentai World", "vi", ContentType.HENTAI)
internal class NhentaiWorld(context: MangaLoaderContext) : internal class NhentaiWorld(context: MangaLoaderContext) :
LegacyPagedMangaParser(context, MangaParserSource.NHENTAIWORLD, 24) { LegacyPagedMangaParser(context, MangaParserSource.NHENTAIWORLD, 24) {
@ -105,7 +106,6 @@ internal class NhentaiWorld(context: MangaLoaderContext) :
} }
} }
override suspend fun getDetails(manga: Manga): Manga { override suspend fun getDetails(manga: Manga): Manga {
val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml() val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
val root = doc.selectFirst("div.flex-1.bg-neutral-900") ?: return manga val root = doc.selectFirst("div.flex-1.bg-neutral-900") ?: return manga
@ -143,51 +143,107 @@ internal class NhentaiWorld(context: MangaLoaderContext) :
} }
} }
val scriptTag = doc.select("script").firstOrNull { it.data().contains("\"data\":") }?.data() val scriptTag = doc.select("script").firstOrNull { script ->
val data = script.data()
data.contains("data") && data.contains("chapterListEn")
}?.data()
val chapters = parseChapterList(scriptTag, manga, chapterDateFormat)
return manga.copy(
tags = tags,
state = state,
description = description,
altTitles = altTitles.orEmpty(),
chapters = chapters.reversed(),
)
}
private suspend fun parseChapterList(scriptTag: String?, manga: Manga, chapterDateFormat: SimpleDateFormat): List<MangaChapter> {
val idManga = manga.url.substringAfter("detail/").toIntOrNull() ?: return emptyList()
val chapters = ArrayList<MangaChapter>() val chapters = ArrayList<MangaChapter>()
if (!scriptTag.isNullOrEmpty()) { if (scriptTag.isNullOrEmpty()) return chapters
val jsonData = JSONObject(scriptTag)
val cleanedScript = scriptTag.replace("\\", "")
val viChaptersArray: JSONArray = jsonData.optJSONArray("data") ?: JSONArray()
val enChaptersArray: JSONArray = jsonData.optJSONArray("chapterListEn") ?: JSONArray() val cutScript = "null,{\"data\""
val needScript = cleanedScript.indexOf(cutScript)
listOf( if (needScript == -1) return chapters
Pair("Tiếng Việt", viChaptersArray), val finalScript = cleanedScript.substring(needScript)
Pair("English", enChaptersArray),
).flatMapTo(chapters) { (branch: String, chaptersArray: JSONArray) -> val vnPrefix = "null,{\"data\":"
List(chaptersArray.length()) { i -> val vnStart = finalScript.indexOf(vnPrefix)
val chapterObj = chaptersArray.getJSONObject(i) if (vnStart == -1) return chapters
val chapterName = chapterObj.getStringOrNull("name") val beforeEn = ",\"chapterListEn\""
val uploadDateStr = chapterObj.getStringOrNull("createdAt") val vnEnd = finalScript.indexOf(beforeEn, vnStart)
val uploadDate = chapterDateFormat.tryParse(uploadDateStr) if (vnEnd == -1) return chapters
val vnChapterStr = finalScript.substring(vnStart + vnPrefix.length, vnEnd)
val vnArray = try {
JSONArray(vnChapterStr)
} catch (e: Exception) {
JSONArray()
}
if (!chapterName.isNullOrEmpty()) { for (i in 0 until vnArray.length()) {
val chapter = vnArray.getJSONObject(i)
val name = chapter.optString("name", null) ?: continue
val uploadDateStr = chapter.optString("createdAt", null)
val uploadDate = chapterDateFormat.tryParse(uploadDateStr)
val href = "${idManga}/${name}?lang=VI"
chapters.add(
MangaChapter( MangaChapter(
id = generateUid("${manga.url}/$chapterName?lang=${if (branch == "Tiếng Việt") "VI" else "EN"}"), id = generateUid(href),
title = chapterName, title = if (name.toFloatOrNull() != null) "Chapter $name" else name,
number = chapterName.toFloatOrNull() ?: (i + 1).toFloat(), number = name.toFloatOrNull() ?: (i + 1).toFloat(),
url = "/read/${manga.id}/$chapterName?lang=${if (branch == "Tiếng Việt") "VI" else "EN"}", url = "/read/${href}",
scanlator = null, scanlator = null,
uploadDate = uploadDate, uploadDate = uploadDate,
branch = branch, branch = "Tiếng Việt",
source = source, source = source,
volume = 0, volume = 0
)
) )
} else null
}.filterNotNull()
} }
// Copy + Paste from VI
val enPrefix = ",\"chapterListEn\":"
val enStart = finalScript.indexOf(enPrefix)
if (enStart == -1) return chapters
val beforeId = ",\"id\""
val enEnd = finalScript.indexOf(beforeId, enStart)
if (enEnd == -1) return chapters
val enChapterStr = finalScript.substring(enStart + enPrefix.length, enEnd)
val enArray = try {
JSONArray(enChapterStr)
} catch (e: Exception) {
JSONArray()
} }
return manga.copy( for (i in 0 until enArray.length()) {
tags = tags, val chapter = enArray.getJSONObject(i)
state = state, val name = chapter.optString("name", null) ?: continue
description = description, val uploadDateStr = chapter.optString("createdAt", null)
altTitles = altTitles.orEmpty(), val uploadDate = chapterDateFormat.tryParse(uploadDateStr)
chapters = chapters, val href = "${idManga}/${name}?lang=EN"
chapters.add(
MangaChapter(
id = generateUid(href),
title = if (name.toFloatOrNull() != null) "Chapter $name" else name,
number = name.toFloatOrNull() ?: (i + 1).toFloat(),
url = "/read/${href}",
scanlator = null,
uploadDate = uploadDate,
branch = "English",
source = source,
volume = 0
)
) )
} }
return chapters
}
override suspend fun getPages(chapter: MangaChapter): List<MangaPage> { override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml() val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml()
@ -203,7 +259,7 @@ internal class NhentaiWorld(context: MangaLoaderContext) :
} }
} }
private suspend fun fetchTags(): Set<MangaTag> { private suspend fun fetchTags(): Set<MangaTag> { // TODO
val doc = webClient.httpGet( val doc = webClient.httpGet(
urlBuilder() urlBuilder()
.addPathSegment("genre") .addPathSegment("genre")
@ -222,4 +278,3 @@ internal class NhentaiWorld(context: MangaLoaderContext) :
} }
} }
} }

Loading…
Cancel
Save