Some adjustments

Co-authored-by: Koitharu <nvasya95@gmail.com>
Zakhar Timoshenko 4 years ago
parent 83dec28ff0
commit 5b35441bf2

@ -6,11 +6,13 @@ import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
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.exception.AuthRequiredException import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
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 java.util.* import java.util.*
private const val STATUS_ONGOING = "連載"
private const val STATUS_FINISHED = "完結"
@MangaSourceParser("NICOVIDEOSEIGA", "Nicovideo Seiga", "ja") @MangaSourceParser("NICOVIDEOSEIGA", "Nicovideo Seiga", "ja")
class NicovideoSeigaParser(override val context: MangaLoaderContext) : MangaParser(MangaSource.NICOVIDEOSEIGA), class NicovideoSeigaParser(override val context: MangaLoaderContext) : MangaParser(MangaSource.NICOVIDEOSEIGA),
MangaParserAuthProvider { MangaParserAuthProvider {
@ -26,8 +28,8 @@ class NicovideoSeigaParser(override val context: MangaLoaderContext) : MangaPars
} }
override suspend fun getUsername(): String { override suspend fun getUsername(): String {
val body = context.httpGet("https://nicovideo.jp/my").parseHtml().body() val body = context.httpGet("https://app.nicovideo.jp/my/apps").parseHtml().body()
return "Nicovideo User" // TODO Figure out return body.selectFirst("#userinfo > div > div > strong")?.text() ?: parseFailed("Cannot get username")
} }
override val sortOrders: Set<SortOrder> = EnumSet.of( override val sortOrders: Set<SortOrder> = EnumSet.of(
@ -44,26 +46,29 @@ class NicovideoSeigaParser(override val context: MangaLoaderContext) : MangaPars
sortOrder: SortOrder?, sortOrder: SortOrder?,
): List<Manga> { ): List<Manga> {
val page = (offset / 20f).toIntUp().inc() val page = (offset / 20f).toIntUp().inc()
if (!query.isNullOrEmpty()) {
return if (offset == 0) getSearchList(query, page) else emptyList()
}
val url = "/manga/list?page=$page&sort=${getSortKey(sortOrder)}".withDomain() val url = "/manga/list?page=$page&sort=${getSortKey(sortOrder)}".withDomain()
val doc = context.httpGet(url).parseHtml() val doc = context.httpGet(url).parseHtml()
val comicList = doc.body().select("#comic_list > ul > li") ?: parseFailed("Container not found") val comicList = doc.body().select("#comic_list > ul > li") ?: parseFailed("Container not found")
val items = comicList.select("div > .description > div > div") val items = comicList.select("div > .description > div > div")
return items.mapNotNull { item -> return items.mapNotNull { item ->
val href = item.select(".comic_icon > div > a").attr("href") ?: return@mapNotNull null val href = item.selectFirst(".comic_icon > div > a")?.attrAsRelativeUrlOrNull("href") ?: return@mapNotNull null
val statusText = item.select(".mg_description_header > .mg_icon > .content_status > span").text() val statusText = item.selectFirst(".mg_description_header > .mg_icon > .content_status > span")?.text()
Manga( Manga(
id = generateUid(href), id = generateUid(href),
title = item.select(".mg_body > .title > a").text() ?: return@mapNotNull null, title = item.selectFirst(".mg_body > .title > a")?.text() ?: return@mapNotNull null,
coverUrl = item.select(".comic_icon > div > a > img").attr("src"), coverUrl = item.selectFirst(".comic_icon > div > a > img")?.attrAsAbsoluteUrl("src").orEmpty(),
altTitle = null, altTitle = null,
author = item.select(".mg_description_header > .mg_author > a").text() ?: return@mapNotNull null, author = item.selectFirst(".mg_description_header > .mg_author > a")?.text(),
rating = RATING_UNKNOWN, rating = RATING_UNKNOWN,
url = href, url = href,
isNsfw = false, isNsfw = false,
tags = emptySet(), tags = emptySet(),
state = when (statusText) { state = when (statusText) {
"連載" -> MangaState.ONGOING STATUS_ONGOING -> MangaState.ONGOING
"完結" -> MangaState.FINISHED STATUS_FINISHED -> MangaState.FINISHED
else -> null else -> null
}, },
publicUrl = href.toAbsoluteUrl(item.host ?: getDomain()), publicUrl = href.toAbsoluteUrl(item.host ?: getDomain()),
@ -74,18 +79,18 @@ class NicovideoSeigaParser(override val context: MangaLoaderContext) : MangaPars
override suspend fun getDetails(manga: Manga): Manga { override suspend fun getDetails(manga: Manga): Manga {
val doc = context.httpGet(manga.url.withDomain()).parseHtml() val doc = context.httpGet(manga.url.withDomain()).parseHtml()
val contents = doc.body().select("#contents") ?: parseFailed("Cannot find root") val contents = doc.body().selectFirst("#contents") ?: parseFailed("Cannot find root")
val statusText = contents.select("div.mg_work_detail > div > div:nth-child(2) > div.tip.content_status.status_series > span").text() val statusText = contents.select("div.mg_work_detail > div > div:nth-child(2) > div.tip.content_status.status_series > span").text()
return manga.copy( return manga.copy(
description = contents.select("div.mg_work_detail > div > div.row > div.description_text").text(), description = contents.selectFirst("div.mg_work_detail > div > div.row > div.description_text")?.html(),
largeCoverUrl = contents.select("div.primaries > div.main_visual > a > img").attr("src"), largeCoverUrl = contents.selectFirst("div.primaries > div.main_visual > a > img")?.attrAsAbsoluteUrlOrNull("src"),
state = when (statusText) { state = when (statusText) {
"連載" -> MangaState.ONGOING STATUS_ONGOING -> MangaState.ONGOING
"完結" -> MangaState.FINISHED STATUS_FINISHED -> MangaState.FINISHED
else -> null else -> null
}, },
chapters = contents.select("#episode_list > ul > li").mapIndexedNotNull { i, li -> chapters = contents.select("#episode_list > ul > li").mapIndexedNotNull { i, li ->
val href = li.select("div > div.description > div.title > a").attr("href").withDomain() val href = li.selectFirst("div > div.description > div.title > a")?.attrAsRelativeUrl("href") ?: parseFailed()
MangaChapter( MangaChapter(
id = generateUid(href), id = generateUid(href),
name = li.select("div > div.description > div.title > a").text(), name = li.select("div > div.description > div.title > a").text(),
@ -106,7 +111,6 @@ class NicovideoSeigaParser(override val context: MangaLoaderContext) : MangaPars
if (!doc.select("#login_manga").isEmpty()) if (!doc.select("#login_manga").isEmpty())
throw AuthRequiredException(source) throw AuthRequiredException(source)
val root = doc.body().select("#page_contents > li") val root = doc.body().select("#page_contents > li")
?: throw ParseException("Root not found")
return root.map { li -> return root.map { li ->
val url = li.select("div > img").attr("data-original") val url = li.select("div > img").attr("data-original")
MangaPage( MangaPage(
@ -123,10 +127,35 @@ class NicovideoSeigaParser(override val context: MangaLoaderContext) : MangaPars
return emptySet() return emptySet()
} }
private suspend fun getSearchList(query: String, page: Int): List<Manga> {
val domain = getDomain()
val doc = context.httpGet("https://$domain/manga/search/?q=$query&page=$page&sort=score").parseHtml()
val root = doc.body().select(".search_result__item")
return root.mapNotNull { item ->
val href = item.selectFirst(".search_result__item__thumbnail > a")?.attrAsRelativeUrl("href") ?: parseFailed()
Manga(
id = generateUid(href),
url = href,
publicUrl = href.toAbsoluteUrl(item.host ?: getDomain()),
title = item.selectFirst(".search_result__item__info > .search_result__item__info--title > a")
?.text()?.trim() ?: return@mapNotNull null,
altTitle = null,
author = null,
tags = emptySet(),
rating = RATING_UNKNOWN,
state = null,
isNsfw = false,
source = source,
coverUrl = item.selectFirst(".search_result__item__thumbnail > a > img")
?.attrAsAbsoluteUrl("data-original").orEmpty(),
)
}
}
private fun getSortKey(sortOrder: SortOrder?) = private fun getSortKey(sortOrder: SortOrder?) =
when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) { when (sortOrder ?: sortOrders.minByOrNull { it.ordinal }) {
SortOrder.POPULARITY -> "manga_view" SortOrder.POPULARITY -> "manga_view"
SortOrder.UPDATED -> "manga_updated" SortOrder.UPDATED -> "manga_updated"
else -> "rate" else -> "manga_view"
} }
} }
Loading…
Cancel
Save