From 90f361e243328887edb37ef9506bfc54a2a4e4c1 Mon Sep 17 00:00:00 2001
From: Eshlender <35057681+e-shl@users.noreply.github.com>
Date: Sat, 3 Feb 2024 10:39:47 +0500
Subject: [PATCH] [RU]ComX title_en not anymore fix null (#953)
---
src/ru/comx/build.gradle | 2 +-
.../src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt | 10 ++--------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/ru/comx/build.gradle b/src/ru/comx/build.gradle
index ff9e36939..9c411a290 100644
--- a/src/ru/comx/build.gradle
+++ b/src/ru/comx/build.gradle
@@ -1,7 +1,7 @@
ext {
extName = 'Com-X'
extClass = '.ComX'
- extVersionCode = 27
+ extVersionCode = 28
}
apply from: "$rootDir/common.gradle"
diff --git a/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt b/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt
index d37f6c61f..075aa27bd 100644
--- a/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt
+++ b/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt
@@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.util.asJsoup
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.contentOrNull
import kotlinx.serialization.json.float
import kotlinx.serialization.json.jsonArray
import kotlinx.serialization.json.jsonObject
@@ -315,14 +316,7 @@ class ComX : ParsedHttpSource() {
val chapters: List<SChapter>? = chaptersList?.map {
val chapter = SChapter.create()
- // 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).trim()
- }
+ chapter.name = it.jsonObject["title"]!!.jsonPrimitive.contentOrNull.toString()
chapter.date_upload = simpleDateFormat.parse(it.jsonObject["date"]!!.jsonPrimitive.content)?.time ?: 0L
chapter.chapter_number = it.jsonObject["posi"]!!.jsonPrimitive.float
// when it is Event add reading order numbers as prefix