From f49ddf743765ac941c411feb04bb57ebb7d8877e Mon Sep 17 00:00:00 2001 From: devi Date: Sat, 13 Jul 2024 21:49:05 +0200 Subject: [PATCH] Fix HentaiVN Remove some warning --- .../koitharu/kotatsu/parsers/site/fr/ScansMangasMe.kt | 2 +- .../kotatsu/parsers/site/heancms/en/OmegaScans.kt | 3 ++- .../koitharu/kotatsu/parsers/site/heancms/fr/PerfScan.kt | 3 ++- .../kotatsu/parsers/site/heancms/pt/ModeScanlator.kt | 3 ++- .../kotatsu/parsers/site/madara/en/ResetScans.kt | 2 +- .../koitharu/kotatsu/parsers/site/nepnep/NepnepParser.kt | 2 +- .../koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt | 9 +++++++-- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScansMangasMe.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScansMangasMe.kt index f2bd90d0..c1f43072 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScansMangasMe.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/fr/ScansMangasMe.kt @@ -132,7 +132,7 @@ internal class ScansMangasMe(context: MangaLoaderContext) : } private fun getChapters(doc: Document): List { - return doc.body().requireElementById("chapter_list").select("li").mapChapters(reversed = true) { i, li -> + return doc.body().requireElementById("chapter_list").select("li").mapChapters(reversed = true) { _, li -> val a = li.selectFirstOrThrow("a") val href = a.attrAsRelativeUrl("href") MangaChapter( diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/en/OmegaScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/en/OmegaScans.kt index 14ab5753..ea4162b3 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/en/OmegaScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/en/OmegaScans.kt @@ -106,7 +106,7 @@ internal class OmegaScans(context: MangaLoaderContext) : HeanCms(context, MangaS val dateFormat = SimpleDateFormat(datePattern, Locale.ENGLISH) val chaptersJsonArray = json.getJSONArray("data") - var totalChapters = json.getJSONObject("meta").getInt("total") + var totalChapters = json.getJSONObject("meta").getInt("total").toFloat() val chapters = chaptersJsonArray.mapJSON { j -> val slug = j.getJSONObject("series").getString("series_slug") val chapterUrl = "https://$domain/$pathManga/$slug/${j.getString("chapter_slug")}" @@ -116,6 +116,7 @@ internal class OmegaScans(context: MangaLoaderContext) : HeanCms(context, MangaS url = chapterUrl, name = j.getString("chapter_name"), number = totalChapters--, + volume = 0, branch = null, uploadDate = dateFormat.tryParse(date), scanlator = null, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/fr/PerfScan.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/fr/PerfScan.kt index 6688d165..d683d619 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/fr/PerfScan.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/fr/PerfScan.kt @@ -125,7 +125,7 @@ internal class PerfScan(context: MangaLoaderContext) : val dateFormat = SimpleDateFormat(datePattern, Locale.ENGLISH) val chaptersJsonArray = json.getJSONArray("data") - var totalChapters = json.getJSONObject("meta").getInt("total") + var totalChapters = json.getJSONObject("meta").getInt("total").toFloat() val chapters = chaptersJsonArray.mapJSON { j -> val slug = j.getJSONObject("series").getString("series_slug") val chapterUrl = "https://$domain/$pathManga/$slug/${j.getString("chapter_slug")}" @@ -135,6 +135,7 @@ internal class PerfScan(context: MangaLoaderContext) : url = chapterUrl, name = j.getString("chapter_name"), number = totalChapters--, + volume = 0, branch = null, uploadDate = dateFormat.tryParse(date), scanlator = null, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/pt/ModeScanlator.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/pt/ModeScanlator.kt index d1a1b764..b3530567 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/pt/ModeScanlator.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/pt/ModeScanlator.kt @@ -108,7 +108,7 @@ internal class ModeScanlator( val dateFormat = SimpleDateFormat(datePattern, Locale.ENGLISH) val chaptersJsonArray = json.getJSONArray("data") - var totalChapters = json.getJSONObject("meta").getInt("total") + var totalChapters = json.getJSONObject("meta").getInt("total").toFloat() val chapters = chaptersJsonArray.mapJSON { j -> val slug = j.getJSONObject("series").getString("series_slug") val chapterUrl = "https://$domain/$pathManga/$slug/${j.getString("chapter_slug")}" @@ -118,6 +118,7 @@ internal class ModeScanlator( url = chapterUrl, name = j.getString("chapter_name"), number = totalChapters--, + volume = 0, branch = null, uploadDate = dateFormat.tryParse(date), scanlator = null, diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ResetScans.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ResetScans.kt index f9f71bbf..fb37d631 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ResetScans.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/ResetScans.kt @@ -27,7 +27,7 @@ internal class ResetScans(context: MangaLoaderContext) : webClient.httpPost(url, emptyMap()).parseHtml() } val dateFormat = SimpleDateFormat(datePattern, sourceLocale) - return doc.select(selectChapter).mapChapters(reversed = true) { i, li -> + return doc.select(selectChapter).mapChapters(reversed = true) { _, li -> val a = li.getElementsByTag("a").findWithText() val href = a?.attrAsRelativeUrlOrNull("href") ?: li.parseFailed("Link is missing") val link = href + stylePage diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/nepnep/NepnepParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/nepnep/NepnepParser.kt index 079c1d3f..f29068ca 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/nepnep/NepnepParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/nepnep/NepnepParser.kt @@ -61,7 +61,7 @@ internal abstract class NepnepParser( val imgUrl = "https://temp.compsci88.com/cover/" + m.getString("i") + ".jpg" val lastUpdate = m.getLong("lt") val views = m.getString("v") - val viewMonth = m.getString("vm") + //val viewMonth = m.getString("vm") when (filter) { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt index 654f435c..6db8f180 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt @@ -23,10 +23,15 @@ private const val SEARCH_PAGE_SIZE = 10 @MangaSourceParser("HENTAIVN", "HentaiVN", "vi", type = ContentType.HENTAI) class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.HENTAIVN) { - override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("zhentaivnz.cc", "hentaivn.homes") + override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("zhentaivnz.cc") // hentaivn has created 2 different interfaces for mobile and desktop, and Cloudflare detects whether it's mobile or not even with a desktop user agent. - override val headers: Headers = Headers.Builder().add("User-Agent", UserAgents.FIREFOX_DESKTOP).build() + private val userAgentKey = ConfigKey.UserAgent(context.getDefaultUserAgent()) + + override fun onCreateConfig(keys: MutableCollection>) { + super.onCreateConfig(keys) + keys.add(userAgentKey) + } override val availableSortOrders: Set = EnumSet.of( SortOrder.UPDATED,