temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-03 10:54:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

migrate to kotlinx.json

Browse Source
This commit is contained in:
Aria Moradi
2021-09-18 01:43:10 +04:30
parent cce7768246
commit 1f3dc682e2
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/src/main/kotlin/eu/kanade/tachiyomi/source/LocalSource.kt
View File

@@ -11,6 +11,13 @@ import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.contentOrNull
import kotlinx.serialization.json.decodeFromStream
import kotlinx.serialization.json.intOrNull
import kotlinx.serialization.json.jsonArray
import kotlinx.serialization.json.jsonPrimitive
import okhttp3.Interceptor import okhttp3.Interceptor
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Protocol import okhttp3.Protocol
@@ -28,6 +35,7 @@ import rx.Observable
import suwayomi.tachidesk.manga.model.table.ExtensionTable import suwayomi.tachidesk.manga.model.table.ExtensionTable
import suwayomi.tachidesk.manga.model.table.SourceTable import suwayomi.tachidesk.manga.model.table.SourceTable
import suwayomi.tachidesk.server.ApplicationDirs import suwayomi.tachidesk.server.ApplicationDirs
import uy.kohesive.injekt.injectLazy
import java.io.File import java.io.File
import java.io.FileNotFoundException import java.io.FileNotFoundException
import java.net.URL import java.net.URL
@@ -123,6 +131,8 @@ class LocalSource(override val baseUrl: String = "") : HttpSource() {
.addInterceptor(FileSystemInterceptor) .addInterceptor(FileSystemInterceptor)
.build() .build()
private val json: Json by injectLazy()
override fun toString() = name override fun toString() = name
override fun fetchPopularManga(page: Int) = fetchSearchManga(page, "", POPULAR_FILTERS) override fun fetchPopularManga(page: Int) = fetchSearchManga(page, "", POPULAR_FILTERS)
@@ -197,16 +207,16 @@ class LocalSource(override val baseUrl: String = "") : HttpSource() {
File(applicationDirs.localMangaRoot, manga.url).listFiles().orEmpty().toList() File(applicationDirs.localMangaRoot, manga.url).listFiles().orEmpty().toList()
.firstOrNull { it.extension == "json" } .firstOrNull { it.extension == "json" }
?.apply { ?.apply {
val reader = this.inputStream().bufferedReader() val obj = json.decodeFromStream<JsonObject>(inputStream())
val json = JsonParser.parseReader(reader).asJsonObject
manga.title = json["title"]?.asString ?: manga.title
manga.author = json["author"]?.asString ?: manga.author manga.title = obj["title"]?.jsonPrimitive?.contentOrNull ?: manga.title
manga.artist = json["artist"]?.asString ?: manga.artist manga.author = obj["author"]?.jsonPrimitive?.contentOrNull ?: manga.author
manga.description = json["description"]?.asString ?: manga.description manga.artist = obj["artist"]?.jsonPrimitive?.contentOrNull ?: manga.artist
manga.genre = json["genre"]?.asJsonArray?.joinToString(", ") { it.asString } manga.description = obj["description"]?.jsonPrimitive?.contentOrNull ?: manga.description
manga.genre = obj["genre"]?.jsonArray?.joinToString(", ") { it.jsonPrimitive.content }
?: manga.genre ?: manga.genre
manga.status = json["status"]?.asInt ?: manga.status manga.status = obj["status"]?.jsonPrimitive?.intOrNull ?: manga.status
} }
return Observable.just(manga) return Observable.just(manga)

2
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt
View File

@@ -160,7 +160,7 @@ object Manga {
val sourceId = mangaEntry[MangaTable.sourceReference] val sourceId = mangaEntry[MangaTable.sourceReference]
val source = getHttpSource(sourceId) val source = getHttpSource(sourceId)
val thumbnailUrl: String = mangaEntry[MangaTable.thumbnail_url] val thumbnailUrl = mangaEntry[MangaTable.thumbnail_url]
?: if (!mangaEntry[MangaTable.initialized]) { ?: if (!mangaEntry[MangaTable.initialized]) {
// initialize then try again // initialize then try again
getManga(mangaId) getManga(mangaId)