Draff
/
Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing titles in BILIBILI. (#10081)

This commit is contained in:
Alessandro Jean 2021-12-12 18:33:28 -03:00 committed by GitHub
parent fa6be0f1c9
commit ebb8a3baf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/en/bilibilicomics/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'BILIBILI COMICS' extName = 'BILIBILI COMICS'
pkgNameSuffix = 'en.bilibilicomics' pkgNameSuffix = 'en.bilibilicomics'
extClass = '.BilibiliComics' extClass = '.BilibiliComics'
extVersionCode = 8 extVersionCode = 9
isNsfw = true isNsfw = true
} }

22
src/en/bilibilicomics/src/eu/kanade/tachiyomi/extension/en/bilibilicomics/BilibiliComics.kt
View File

@ -55,7 +55,7 @@ class BilibiliComics : HttpSource() {
val requestPayload = buildJsonObject { val requestPayload = buildJsonObject {
put("area_id", -1) put("area_id", -1)
put("is_finish", -1) put("is_finish", -1)
put("is_free", 1) put("is_free", -1)
put("order", 0) put("order", 0)
put("page_num", page) put("page_num", page)
put("page_size", POPULAR_PER_PAGE) put("page_size", POPULAR_PER_PAGE)
@ -99,7 +99,7 @@ class BilibiliComics : HttpSource() {
val requestPayload = buildJsonObject { val requestPayload = buildJsonObject {
put("area_id", -1) put("area_id", -1)
put("is_finish", -1) put("is_finish", -1)
put("is_free", 1) put("is_free", -1)
put("order", 1) put("order", 1)
put("page_num", page) put("page_num", page)
put("page_size", POPULAR_PER_PAGE) put("page_size", POPULAR_PER_PAGE)
@ -161,7 +161,7 @@ class BilibiliComics : HttpSource() {
val jsonPayload = buildJsonObject { val jsonPayload = buildJsonObject {
put("area_id", -1) put("area_id", -1)
put("is_finish", status) put("is_finish", status)
put("is_free", 1) put("is_free", -1)
put("order", order) put("order", order)
put("page_num", page) put("page_num", page)
put("page_size", pageSize) put("page_size", pageSize)
@ -272,6 +272,11 @@ class BilibiliComics : HttpSource() {
description = comic.classicLines description = comic.classicLines
thumbnail_url = comic.verticalCover thumbnail_url = comic.verticalCover
url = "/detail/mc" + comic.id url = "/detail/mc" + comic.id
if (comic.episodeList.any { episode -> episode.payMode == 1 && episode.payGold > 0 }) {
description += "\n\nThis series have paid chapters that were filtered out from the " +
"chapter list. Use the BILIBILI website or the official app to read them for now."
}
} }
// Chapters are available in the same url of the manga details. // Chapters are available in the same url of the manga details.
@ -284,7 +289,7 @@ class BilibiliComics : HttpSource() {
return emptyList() return emptyList()
return result.data!!.episodeList return result.data!!.episodeList
.filterNot { episode -> episode.isLocked } .filter { episode -> episode.payMode == 0 && episode.payGold == 0 }
.map { ep -> chapterFromObject(ep, result.data.id) } .map { ep -> chapterFromObject(ep, result.data.id) }
} }
@ -297,7 +302,10 @@ class BilibiliComics : HttpSource() {
override fun pageListRequest(chapter: SChapter): Request { override fun pageListRequest(chapter: SChapter): Request {
val chapterId = chapter.url.substringAfterLast("/").toInt() val chapterId = chapter.url.substringAfterLast("/").toInt()
val jsonPayload = buildJsonObject { put("ep_id", chapterId) } val jsonPayload = buildJsonObject {
put("credential", "")
put("ep_id", chapterId)
}
val requestBody = jsonPayload.toString().toRequestBody(JSON_MEDIA_TYPE) val requestBody = jsonPayload.toString().toRequestBody(JSON_MEDIA_TYPE)
val newHeaders = headersBuilder() val newHeaders = headersBuilder()
@ -412,6 +420,8 @@ class BilibiliComics : HttpSource() {
const val PREFIX_ID_SEARCH = "id:" const val PREFIX_ID_SEARCH = "id:"
private val ID_SEARCH_PATTERN = "^id:(mc)?(\\d+)$".toRegex() private val ID_SEARCH_PATTERN = "^id:(mc)?(\\d+)$".toRegex()
private val DATE_FORMATTER by lazy { SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH) } private val DATE_FORMATTER by lazy {
SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH)
}
} }
} }

3
src/en/bilibilicomics/src/eu/kanade/tachiyomi/extension/en/bilibilicomics/BilibiliDto.kt
View File

@ -32,7 +32,8 @@ data class BilibiliComicDto(
@Serializable @Serializable
data class BilibiliEpisodeDto( data class BilibiliEpisodeDto(
val id: Int, val id: Int,
@SerialName("is_locked") val isLocked: Boolean, @SerialName("pay_gold") val payGold: Int,
@SerialName("pay_mode") val payMode: Int,
@SerialName("pub_time") val publicationTime: String, @SerialName("pub_time") val publicationTime: String,
@SerialName("short_title") val shortTitle: String, @SerialName("short_title") val shortTitle: String,
val title: String val title: String