KotatsuApp
/
kotatsu-parsers
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tiny refactoring

Browse Source
pull/421/head
Koitharu 2 years ago
parent b1da5c2924
commit 4db7ccc853
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7
2 changed files with 26 additions and 48 deletions
Show Stats Download Patch File Download Diff File

24
src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaPark.kt
Unescape Escape View File

@ -2,8 +2,6 @@ package org.koitharu.kotatsu.parsers.site.all
import androidx.collection.ArrayMap import androidx.collection.ArrayMap
import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.PagedMangaParser import org.koitharu.kotatsu.parsers.PagedMangaParser
@ -16,7 +14,7 @@ import java.util.*
@MangaSourceParser("MANGAPARK", "MangaPark") @MangaSourceParser("MANGAPARK", "MangaPark")
internal class MangaPark(context: MangaLoaderContext) : internal class MangaPark(context: MangaLoaderContext) :
PagedMangaParser(context, MangaSource.MANGAPARK, pageSize = 15) { PagedMangaParser(context, MangaSource.MANGAPARK, pageSize = 36) {
override val availableSortOrders: Set<SortOrder> = EnumSet.allOf(SortOrder::class.java) override val availableSortOrders: Set<SortOrder> = EnumSet.allOf(SortOrder::class.java)
@ -24,6 +22,8 @@ internal class MangaPark(context: MangaLoaderContext) :
override val configKeyDomain = ConfigKey.Domain("mangapark.net") override val configKeyDomain = ConfigKey.Domain("mangapark.net")
private val tagsMap = SuspendLazy(::parseTags)
init { init {
context.cookieJar.insertCookies(domain, "nsfw", "2") context.cookieJar.insertCookies(domain, "nsfw", "2")
} }
@ -101,18 +101,14 @@ internal class MangaPark(context: MangaLoaderContext) :
} }
} }
private var tagCache: ArrayMap<String, MangaTag>? = null
private val mutex = Mutex()
override suspend fun getAvailableTags(): Set<MangaTag> { override suspend fun getAvailableTags(): Set<MangaTag> {
return getOrCreateTagMap().values.toSet() return tagsMap.get().values.toSet()
} }
private suspend fun getOrCreateTagMap(): Map<String, MangaTag> = mutex.withLock { private suspend fun parseTags(): Map<String, MangaTag> {
tagCache?.let { return@withLock it }
val tagMap = ArrayMap<String, MangaTag>()
val tagElements = webClient.httpGet("https://$domain/search").parseHtml() val tagElements = webClient.httpGet("https://$domain/search").parseHtml()
.select("div.flex-col:contains(Genres) div.whitespace-nowrap") .select("div.flex-col:contains(Genres) div.whitespace-nowrap")
val tagMap = ArrayMap<String, MangaTag>(tagElements.size)
for (el in tagElements) { for (el in tagElements) {
val name = el.selectFirstOrThrow("span.whitespace-nowrap").text() val name = el.selectFirstOrThrow("span.whitespace-nowrap").text()
if (name.isEmpty()) continue if (name.isEmpty()) continue
@ -122,8 +118,7 @@ internal class MangaPark(context: MangaLoaderContext) :
source = source, source = source,
) )
} }
tagCache = tagMap return tagMap
return@withLock tagMap
} }
override suspend fun getAvailableLocales(): Set<Locale> = setOf( override suspend fun getAvailableLocales(): Set<Locale> = setOf(
@ -151,11 +146,10 @@ internal class MangaPark(context: MangaLoaderContext) :
override suspend fun getDetails(manga: Manga): Manga = coroutineScope { override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml() val doc = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml()
val tagMap = getOrCreateTagMap() val tagMap = tagsMap.get()
val selectTag = doc.select("div[q:key=30_2] span.whitespace-nowrap") val selectTag = doc.select("div[q:key=30_2] span.whitespace-nowrap")
val tags = selectTag.mapNotNullToSet { tagMap[it.text()] } val tags = selectTag.mapNotNullToSet { tagMap[it.text()] }
val nsfw = val nsfw = tags.any { t -> t.key == "hentai" || t.key == "adult" }
tags.contains(MangaTag("Hentai", "hentai", source)) || tags.contains(MangaTag("Adult", "adult", source))
val dateFormat = SimpleDateFormat("dd/MM/yyyy", sourceLocale) val dateFormat = SimpleDateFormat("dd/MM/yyyy", sourceLocale)
manga.copy( manga.copy(
altTitle = doc.selectFirst("div[q:key=tz_2]")?.text().orEmpty(), altTitle = doc.selectFirst("div[q:key=tz_2]")?.text().orEmpty(),

50
src/main/kotlin/org/koitharu/kotatsu/parsers/site/all/MangaPlusParser.kt
Unescape Escape View File

@ -12,26 +12,13 @@ import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaParser import org.koitharu.kotatsu.parsers.MangaParser
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.model.Manga import org.koitharu.kotatsu.parsers.model.*
import org.koitharu.kotatsu.parsers.model.MangaChapter import org.koitharu.kotatsu.parsers.util.*
import org.koitharu.kotatsu.parsers.model.MangaListFilter
import org.koitharu.kotatsu.parsers.model.MangaPage
import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.model.MangaState
import org.koitharu.kotatsu.parsers.model.MangaTag
import org.koitharu.kotatsu.parsers.model.RATING_UNKNOWN
import org.koitharu.kotatsu.parsers.model.SortOrder
import org.koitharu.kotatsu.parsers.util.SuspendLazy
import org.koitharu.kotatsu.parsers.util.domain
import org.koitharu.kotatsu.parsers.util.generateUid
import org.koitharu.kotatsu.parsers.util.json.getStringOrNull import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
import org.koitharu.kotatsu.parsers.util.json.mapJSON import org.koitharu.kotatsu.parsers.util.json.mapJSON
import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull
import org.koitharu.kotatsu.parsers.util.json.toJSONList import org.koitharu.kotatsu.parsers.util.json.toJSONList
import org.koitharu.kotatsu.parsers.util.parseJson import java.util.*
import org.koitharu.kotatsu.parsers.util.toAbsoluteUrl
import org.koitharu.kotatsu.parsers.util.toTitleCase
import java.util.UUID
internal abstract class MangaPlusParser( internal abstract class MangaPlusParser(
context: MangaLoaderContext, context: MangaLoaderContext,
@ -39,9 +26,10 @@ internal abstract class MangaPlusParser(
private val sourceLang: String, private val sourceLang: String,
) : MangaParser(context, source), Interceptor { ) : MangaParser(context, source), Interceptor {
private val apiUrl = "https://jumpg-webapi.tokyo-cdn.com/api"
override val configKeyDomain = ConfigKey.Domain("mangaplus.shueisha.co.jp") override val configKeyDomain = ConfigKey.Domain("mangaplus.shueisha.co.jp")
override val availableSortOrders = setOf( override val availableSortOrders: Set<SortOrder> = EnumSet.of(
SortOrder.POPULARITY, SortOrder.POPULARITY,
SortOrder.UPDATED, SortOrder.UPDATED,
SortOrder.ALPHABETICAL, SortOrder.ALPHABETICAL,
@ -106,16 +94,19 @@ internal abstract class MangaPlusParser(
return mapNotNull { return mapNotNull {
val language = it.getStringOrNull("language") ?: "ENGLISH" val language = it.getStringOrNull("language") ?: "ENGLISH"
if (language != sourceLang) if (language != sourceLang) {
return@mapNotNull null return@mapNotNull null
}
val name = it.getString("name") val name = it.getString("name")
val author = it.getString("author") val author = it.getString("author")
.split("/").joinToString(transform = String::trim) .split('/')
.joinToString(transform = String::trim)
// filter out any other title or author which doesn't match search input // filter out any other title or author which doesn't match search input
if (query != null && !(name.contains(query, true) || author.contains(query, true))) if (query != null && !(name.contains(query, true) || author.contains(query, true))) {
return@mapNotNull null return@mapNotNull null
}
val titleId = it.getInt("titleId").toString() val titleId = it.getInt("titleId").toString()
@ -164,12 +155,10 @@ internal abstract class MangaPlusParser(
json.getJSONArray("chapterListGroup"), json.getJSONArray("chapterListGroup"),
title.getStringOrNull("language") ?: "ENGLISH", title.getStringOrNull("language") ?: "ENGLISH",
), ),
state = if (completed) { state = when {
MangaState.FINISHED completed -> MangaState.FINISHED
} else if (hiatus) { hiatus -> MangaState.PAUSED
MangaState.PAUSED else -> MangaState.ONGOING
} else {
MangaState.ONGOING
}, },
) )
} }
@ -182,10 +171,9 @@ internal abstract class MangaPlusParser(
it.optJSONArray("lastChapterList")?.toJSONList().orEmpty() it.optJSONArray("lastChapterList")?.toJSONList().orEmpty()
} }
return chapterList.mapNotNull { chapter -> return chapterList.mapChapters { _, chapter ->
val chapterId = chapter.getInt("chapterId").toString() val chapterId = chapter.getInt("chapterId").toString()
val subtitle = chapter.getStringOrNull("subTitle") val subtitle = chapter.getStringOrNull("subTitle") ?: return@mapChapters null
?: return@mapNotNull null
MangaChapter( MangaChapter(
id = generateUid(chapterId), id = generateUid(chapterId),
@ -275,10 +263,6 @@ internal abstract class MangaPlusParser(
} }
} }
companion object {
private const val apiUrl = "https://jumpg-webapi.tokyo-cdn.com/api"
}
@MangaSourceParser("MANGAPLUSPARSER_EN", "MANGA Plus English", "en") @MangaSourceParser("MANGAPLUSPARSER_EN", "MANGA Plus English", "en")
class English(context: MangaLoaderContext) : MangaPlusParser( class English(context: MangaLoaderContext) : MangaPlusParser(
context, context,

Write Preview
Loading…
Cancel
Save