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

[RU]ComX: Crossover-events handle, chapter naming cleanup (#15945)

Browse Source 
* Crossover-events handle, chapter naming cleanup

* Crossover-events handle, chapter naming cleanup
This commit is contained in:
Alexander 2023-04-04 18:38:42 +03:00 committed by GitHub
parent 373b9cf4ec
commit d01c9e8f3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ru/comx/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'Com-X'
pkgNameSuffix = 'ru.comx'
extClass = '.ComX'
extVersionCode = 24
extVersionCode = 25
}
apply from: "$rootDir/common.gradle"

33
src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt
View File

@ -298,18 +298,37 @@ class ComX : ParsedHttpSource() {
val data = json.decodeFromString<JsonObject>(dataStr)
val chaptersList = data["chapters"]?.jsonArray
// If chapter name starts with #number or every chapter starts with same name before #number then it is not crossover-event
fun checkCrossEvent(strTitKey: String): Boolean {
return !(
chaptersList.orEmpty().any {
it.jsonObject[strTitKey]!!.jsonPrimitive.content.startsWith("#")
} || chaptersList.orEmpty().all {
it.jsonObject[strTitKey]!!.jsonPrimitive.content.substringBefore('#') ==
chaptersList!![0].jsonObject[strTitKey]!!.jsonPrimitive.content.substringBefore('#')
}
)
}
val isCrossoverEvent = checkCrossEvent("title_en") || checkCrossEvent("title")
val chapters: List<SChapter>? = chaptersList?.map {
val chapter = SChapter.create()
// title_en is full chapter name, no english name
chapter.name = it.jsonObject["title_en"]!!.jsonPrimitive.content
if (chapter.name.isEmpty()) {
chapter.name = it.jsonObject["title"]!!.jsonPrimitive.content
}
if (chapter.name == "[перевода не существует]") {
chapter.name = it.jsonObject["title"]!!.jsonPrimitive.content + " " + "[перевода не существует]"
// Usually "title" is main chapter name info, "title_en" is additional chapter name info.
// I decided to keep them both because who knows where they decided to put useful info today.
// Except when they are the same.
chapter.name = if (it.jsonObject["title"]!!.jsonPrimitive.content == it.jsonObject["title_en"]!!.jsonPrimitive.content) {
it.jsonObject["title"]!!.jsonPrimitive.content
} else {
it.jsonObject["title"]!!.jsonPrimitive.content + " " + it.jsonObject["title_en"]!!.jsonPrimitive.content
}
chapter.date_upload = simpleDateFormat.parse(it.jsonObject["date"]!!.jsonPrimitive.content)?.time ?: 0L
chapter.chapter_number = it.jsonObject["posi"]!!.jsonPrimitive.float
// when it is Crossover-Event add reading order numbers as prefix
if (isCrossoverEvent) {
chapter.name = chapter.chapter_number.toInt().toString() + " " + chapter.name
}
chapter.setUrlWithoutDomain("/readcomix/" + data["news_id"] + "/" + it.jsonObject["id"]!!.jsonPrimitive.content + ".html")
chapter
}