KotatsuApp
/
Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

[Shinigami] Fixes

Browse Source
Koitharu 1 year ago
parent b24741678c
commit d2b2578a3a
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7
1 changed files with 251 additions and 254 deletions
Show Stats Download Patch File Download Diff File

487
src/main/kotlin/org/koitharu/kotatsu/parsers/site/id/Shinigami.kt
Unescape Escape View File

@ -6,282 +6,279 @@ 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.model.* import org.koitharu.kotatsu.parsers.model.*
import org.koitharu.kotatsu.parsers.network.UserAgents
import org.koitharu.kotatsu.parsers.util.* import org.koitharu.kotatsu.parsers.util.*
import org.koitharu.kotatsu.parsers.util.json.* import org.koitharu.kotatsu.parsers.util.json.*
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
import org.koitharu.kotatsu.parsers.Broken
@Broken("TODO: Add author search")
@MangaSourceParser("SHINIGAMI", "Shinigami", "id") @MangaSourceParser("SHINIGAMI", "Shinigami", "id")
internal class Shinigami(context: MangaLoaderContext) : internal class Shinigami(context: MangaLoaderContext) :
LegacyPagedMangaParser(context, MangaParserSource.SHINIGAMI, 24) { LegacyPagedMangaParser(context, MangaParserSource.SHINIGAMI, 24) {
override val configKeyDomain = ConfigKey.Domain("id.shinigami.asia") override val configKeyDomain = ConfigKey.Domain("id.shinigami.asia")
private val apiSuffix = "api.shngm.io/v1" private val apiSuffix = "api.shngm.io/v1"
private val cdnSuffix = "storage.shngm.id" private val cdnSuffix = "storage.shngm.id"
override fun onCreateConfig(keys: MutableCollection<ConfigKey<*>>) { override fun onCreateConfig(keys: MutableCollection<ConfigKey<*>>) {
super.onCreateConfig(keys) super.onCreateConfig(keys)
keys.add(userAgentKey) keys.add(userAgentKey)
} }
override fun getRequestHeaders(): Headers = Headers.Builder() override fun getRequestHeaders(): Headers = Headers.Builder()
.add("referer", "https://$domain/") .add("referer", "https://$domain/")
.add("sec-fetch-dest", "empty") .add("sec-fetch-dest", "empty")
.build() .build()
override val availableSortOrders: Set<SortOrder> = EnumSet.of( override val availableSortOrders: Set<SortOrder> = EnumSet.of(
SortOrder.POPULARITY, SortOrder.POPULARITY,
SortOrder.POPULARITY_ASC, SortOrder.POPULARITY_ASC,
SortOrder.NEWEST, SortOrder.NEWEST,
SortOrder.NEWEST_ASC, SortOrder.NEWEST_ASC,
SortOrder.RATING, SortOrder.RATING,
SortOrder.RATING_ASC, SortOrder.RATING_ASC,
) )
override suspend fun getFilterOptions(): MangaListFilterOptions { override suspend fun getFilterOptions(): MangaListFilterOptions {
return MangaListFilterOptions( return MangaListFilterOptions(
availableTags = fetchTags(), availableTags = fetchTags(),
availableStates = EnumSet.of( availableStates = EnumSet.of(
MangaState.ONGOING, MangaState.ONGOING,
MangaState.FINISHED, MangaState.FINISHED,
MangaState.PAUSED MangaState.PAUSED,
), ),
availableContentTypes = EnumSet.of( availableContentTypes = EnumSet.of(
ContentType.MANGA, ContentType.MANGA,
ContentType.MANHWA, ContentType.MANHWA,
ContentType.MANHUA ContentType.MANHUA,
), ),
) )
} }
override val filterCapabilities: MangaListFilterCapabilities override val filterCapabilities: MangaListFilterCapabilities
get() = MangaListFilterCapabilities( get() = MangaListFilterCapabilities(
isMultipleTagsSupported = true, isMultipleTagsSupported = true,
isTagsExclusionSupported = true, isTagsExclusionSupported = true,
isSearchSupported = true, isSearchSupported = true,
isSearchWithFiltersSupported = true, isSearchWithFiltersSupported = true,
) )
override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List<Manga> { override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List<Manga> {
val url = buildString { val url = buildString {
append("https://") append("https://")
append(apiSuffix) append(apiSuffix)
append("/manga/list") append("/manga/list")
append("?page=") append("?page=")
append(page.toString()) append(page.toString())
append("&page_size=") append("&page_size=")
append(pageSize) append(pageSize)
append("&sort=") append("&sort=")
append( append(
when (order) { when (order) {
SortOrder.POPULARITY, SortOrder.POPULARITY_ASC -> "popularity" SortOrder.POPULARITY, SortOrder.POPULARITY_ASC -> "popularity"
SortOrder.NEWEST, SortOrder.NEWEST_ASC -> "latest" SortOrder.NEWEST, SortOrder.NEWEST_ASC -> "latest"
SortOrder.RATING, SortOrder.RATING_ASC -> "rating" SortOrder.RATING, SortOrder.RATING_ASC -> "rating"
else -> "latest" else -> "latest"
} },
) )
append("&sort_order=") append("&sort_order=")
append( append(
when (order) { when (order) {
SortOrder.POPULARITY_ASC, SortOrder.NEWEST_ASC, SortOrder.RATING_ASC -> "asc" SortOrder.POPULARITY_ASC, SortOrder.NEWEST_ASC, SortOrder.RATING_ASC -> "asc"
else -> "desc" else -> "desc"
} },
) )
filter.states.oneOrThrowIfMany()?.let { filter.states.oneOrThrowIfMany()?.let {
append("&status=") append("&status=")
append( append(
when (it) { when (it) {
MangaState.FINISHED -> "completed" MangaState.FINISHED -> "completed"
MangaState.ONGOING -> "ongoing" MangaState.ONGOING -> "ongoing"
MangaState.PAUSED -> "hiatus" MangaState.PAUSED -> "hiatus"
else -> "" else -> ""
} },
) )
} }
if (filter.types.isNotEmpty()) { if (filter.types.isNotEmpty()) {
filter.types.forEach { filter.types.forEach {
append("&format=") append("&format=")
append( append(
when (it) { when (it) {
ContentType.MANGA -> "manga" ContentType.MANGA -> "manga"
ContentType.MANHUA -> "manhua" ContentType.MANHUA -> "manhua"
ContentType.MANHWA -> "manhwa" ContentType.MANHWA -> "manhwa"
else -> "" else -> ""
} },
) )
} }
} }
if (filter.tags.isNotEmpty()) { if (filter.tags.isNotEmpty()) {
append("&genre_include=") append("&genre_include=")
filter.tags.joinTo(this, separator = ",") { it.key } filter.tags.joinTo(this, separator = ",") { it.key }
append("&genre_include_mode=and") append("&genre_include_mode=and")
} }
if (filter.tagsExclude.isNotEmpty()) { if (filter.tagsExclude.isNotEmpty()) {
append("&genre_exclude=") append("&genre_exclude=")
filter.tagsExclude.joinTo(this, separator = ",") { it.key } filter.tagsExclude.joinTo(this, separator = ",") { it.key }
append("&genre_exclude_mode=and") append("&genre_exclude_mode=and")
} }
if (!filter.query.isNullOrEmpty()) { if (!filter.author.isNullOrEmpty()) {
append("&q=") append("&author=")
val encodedQuery = filter.query.splitByWhitespace() append(filter.author.lowercase().replace(' ', '-').urlEncoded())
.joinToString(separator = "+") { part -> }
part.urlEncoded()
}
append(encodedQuery)
}
}
val json = webClient.httpGet(url).parseJson() if (!filter.query.isNullOrEmpty()) {
val data = json.getJSONArray("data") append("&q=")
val encodedQuery = filter.query.splitByWhitespace()
.joinToString(separator = "+") { part ->
part.urlEncoded()
}
append(encodedQuery)
}
}
return data.mapJSON { jo -> val json = webClient.httpGet(url).parseJson()
val id = jo.getString("manga_id") val data = json.getJSONArray("data")
Manga(
id = generateUid(id),
url = "/manga/detail/$id",
publicUrl = "https://$domain/series/$id",
title = jo.getString("title"),
altTitles = setOf(jo.optString("alternative_title") ?: ""),
coverUrl = jo.getString("cover_image_url"),
largeCoverUrl = jo.optString("cover_portrait_url")
.takeIf { it.isNotEmpty() },
authors = jo.optJSONObject("taxonomy")
?.optJSONArray("Author")
?.mapJSONToSet { x ->
x.getString("name")
}.orEmpty(),
tags = jo.optJSONObject("taxonomy")
?.optJSONArray("Genre")
?.mapJSONToSet { x ->
MangaTag(
key = x.getString("slug"),
title = x.getString("name"),
source = source
)
}.orEmpty(),
state = when (jo.getInt("status")) {
1 -> MangaState.ONGOING
2 -> MangaState.FINISHED
3 -> MangaState.PAUSED
else -> null
},
description = jo.optString("description"),
contentRating = null,
source = source,
rating = RATING_UNKNOWN
)
}
}
override suspend fun getDetails(manga: Manga): Manga { return data.mapJSON { jo ->
val json = webClient.httpGet("https://$apiSuffix" + manga.url).parseJson() val id = jo.getString("manga_id")
val jo = json.getJSONObject("data") Manga(
val id = jo.getString("manga_id") id = generateUid(id),
url = "/manga/detail/$id",
publicUrl = "https://$domain/series/$id",
title = jo.getString("title"),
altTitles = setOfNotNull(jo.getStringOrNull("alternative_title")),
coverUrl = jo.getStringOrNull("cover_image_url"),
largeCoverUrl = jo.getStringOrNull("cover_portrait_url"),
authors = jo.optJSONObject("taxonomy")
?.optJSONArray("Author")
?.mapJSONToSet { x ->
x.getString("name")
}.orEmpty(),
tags = jo.optJSONObject("taxonomy")
?.optJSONArray("Genre")
?.mapJSONToSet { x ->
MangaTag(
key = x.getString("slug"),
title = x.getString("name").toTitleCase(sourceLocale),
source = source,
)
}.orEmpty(),
state = when (jo.getIntOrDefault("status", 0)) {
1 -> MangaState.ONGOING
2 -> MangaState.FINISHED
3 -> MangaState.PAUSED
else -> null
},
description = jo.getStringOrNull("description"),
contentRating = null,
source = source,
rating = RATING_UNKNOWN,
)
}
}
return manga.copy( override suspend fun getDetails(manga: Manga): Manga {
tags = jo.optJSONObject("taxonomy") val json = webClient.httpGet("https://$apiSuffix${manga.url}").parseJson()
?.optJSONArray("Genre") val jo = json.getJSONObject("data")
?.mapJSONToSet { x -> val id = jo.getString("manga_id")
MangaTag(
key = x.getString("slug"),
title = x.getString("name"),
source = source,
)
}.orEmpty(),
authors = jo.optJSONObject("taxonomy")
?.optJSONArray("Author")
?.mapJSONToSet { x ->
x.getString("name")
}.orEmpty(),
state = when (jo.getInt("status")) {
1 -> MangaState.ONGOING
2 -> MangaState.FINISHED
3 -> MangaState.PAUSED
else -> null
},
description = jo.optString("description"),
largeCoverUrl = jo.optString("cover_portrait_url")
.takeIf { it.isNotEmpty() },
chapters = getChapters(id)
)
}
private suspend fun getChapters(mangaId: String): List<MangaChapter> { return manga.copy(
val url = "https://$apiSuffix/chapter/$mangaId/list?page=1&page_size=9999&sort_by=chapter_number&sort_order=asc" tags = jo.optJSONObject("taxonomy")
val json = webClient.httpGet(url).parseJson() ?.optJSONArray("Genre")
val data = json.getJSONArray("data") ?.mapJSONToSet { x ->
MangaTag(
key = x.getString("slug"),
title = x.getString("name"),
source = source,
)
} ?: manga.tags,
authors = jo.optJSONObject("taxonomy")
?.optJSONArray("Author")
?.mapJSONToSet { x ->
x.getString("name")
} ?: manga.authors,
state = when (jo.getIntOrDefault("status", 0)) {
1 -> MangaState.ONGOING
2 -> MangaState.FINISHED
3 -> MangaState.PAUSED
else -> null
},
description = jo.getStringOrNull("description"),
largeCoverUrl = jo.getStringOrNull("cover_portrait_url"),
chapters = getChapters(id),
)
}
return data.mapJSON { jo -> private suspend fun getChapters(mangaId: String): List<MangaChapter> {
val chapterId = jo.getString("chapter_id") val url = "https://$apiSuffix/chapter/$mangaId/list?page=1&page_size=9999&sort_by=chapter_number&sort_order=asc"
val number = jo.getInt("chapter_number") val json = webClient.httpGet(url).parseJson()
val title = jo.optString("chapter_title") val data = json.getJSONArray("data")
.takeIf { it.isNotEmpty() }
?: "Chapter $number"
MangaChapter( return data.mapJSON { jo ->
id = generateUid(chapterId), val chapterId = jo.getString("chapter_id")
title = title, val title = jo.getStringOrNull("chapter_title")
number = number.toFloat(),
url = "chapter/detail/$chapterId",
scanlator = null,
uploadDate = jo.getString("release_date").parseDate(),
branch = null,
source = source,
volume = 0
)
}
}
override suspend fun getPages(chapter: MangaChapter): List<MangaPage> { MangaChapter(
val json = webClient.httpGet("https://$apiSuffix/${chapter.url}").parseJson() id = generateUid(chapterId),
val data = json.getJSONObject("data") title = title,
val chapterData = data.getJSONObject("chapter") number = jo.getFloatOrDefault("chapter_number", 0f),
val basePath = chapterData.getString("path") url = "chapter/detail/$chapterId",
val datas = chapterData.getJSONArray("data") scanlator = null,
uploadDate = jo.getString("release_date").parseDate(),
branch = null,
source = source,
volume = 0,
)
}
}
return List(datas.length()) { i -> override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
val imgExt = datas.getString(i) val json = webClient.httpGet("https://$apiSuffix/${chapter.url}").parseJson()
val imageUrl = "https://$cdnSuffix" + basePath + imgExt val data = json.getJSONObject("data")
val chapterData = data.getJSONObject("chapter")
val basePath = chapterData.getString("path")
val datas = chapterData.getJSONArray("data")
MangaPage( return List(datas.length()) { i ->
id = generateUid(imageUrl), val imgExt = datas.getString(i)
url = imageUrl, val imageUrl = "https://$cdnSuffix$basePath$imgExt"
preview = null,
source = source,
)
}
}
private suspend fun fetchTags(): Set<MangaTag> { MangaPage(
val json = webClient.httpGet("https://$apiSuffix/genre/list").parseJson() id = generateUid(imageUrl),
url = imageUrl,
preview = null,
source = source,
)
}
}
return json.getJSONArray("data").mapJSONToSet { x -> private suspend fun fetchTags(): Set<MangaTag> {
MangaTag( val json = webClient.httpGet("https://$apiSuffix/genre/list").parseJson()
key = x.getString("slug"),
title = x.getString("name"),
source = source,
)
}
}
private fun String.parseDate(): Long { return json.getJSONArray("data").mapJSONToSet { x ->
return try { MangaTag(
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US) key = x.getString("slug"),
.apply { title = x.getString("name").toTitleCase(sourceLocale),
timeZone = TimeZone.getTimeZone("UTC") source = source,
} )
.parse(this)?.time ?: 0L }
} catch (e: Exception) { }
0L
} private fun String.parseDate(): Long {
} return try {
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US)
.apply {
timeZone = TimeZone.getTimeZone("UTC")
}
.parse(this)?.time ?: 0L
} catch (e: Exception) {
0L
}
}
} }
Write Preview
Loading…
Cancel
Save