remove gson (#295)

* remove gson * also remove kotson * fix build
Suwayomi · Feb 19, 2022 · 4bbe513 · 4bbe513
1 parent c289786
commit 4bbe513
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 44 deletions.
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -44,8 +44,6 @@ dependencies {
     implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
     implementation("io.reactivex:rxjava:1.3.8")
     implementation("org.jsoup:jsoup:1.14.3")
-    implementation("com.google.code.gson:gson:2.8.9")
-    implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
 
     // Sort
     implementation("com.github.gpanther:java-nat-sort:natural-comparator-1.1")

diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt
@@ -7,8 +7,6 @@ package eu.kanade.tachiyomi
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import android.app.Application
-import com.google.gson.Gson
 // import eu.kanade.tachiyomi.data.cache.ChapterCache
 // import eu.kanade.tachiyomi.data.cache.CoverCache
 // import eu.kanade.tachiyomi.data.database.DatabaseHelper
@@ -17,6 +15,7 @@ import com.google.gson.Gson
 // import eu.kanade.tachiyomi.data.sync.LibrarySyncManager
 // import eu.kanade.tachiyomi.data.track.TrackManager
 // import eu.kanade.tachiyomi.extension.ExtensionManager
+import android.app.Application
 import eu.kanade.tachiyomi.network.NetworkHelper
 import kotlinx.serialization.json.Json
 import rx.Observable
@@ -53,8 +52,6 @@ class AppModule(val app: Application) : InjektModule {
 //
 //        addSingletonFactory { LibrarySyncManager(app) }
 
-        addSingletonFactory { Gson() }
-
         addSingletonFactory { Json { ignoreUnknownKeys = true } }
 
         // Asynchronously init expensive components for a faster cold start

diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
@@ -1,7 +1,8 @@
 package eu.kanade.tachiyomi.network
 
-// import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.OkHttpClient
@@ -11,6 +12,8 @@ import okhttp3.internal.closeQuietly
 import rx.Observable
 import rx.Producer
 import rx.Subscription
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.fullType
 import java.io.IOException
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.coroutines.resumeWithException
@@ -124,3 +127,12 @@ fun OkHttpClient.newCallWithProgress(request: Request, listener: ProgressListene
 
     return progressClient.newCall(request)
 }
+
+inline fun <reified T> Response.parseAs(): T {
+    // Avoiding Injekt.get<Json>() due to compiler issues
+    val json = Injekt.getInstance<Json>(fullType<Json>().type)
+    this.use {
+        val responseBody = it.body?.string().orEmpty()
+        return json.decodeFromString(responseBody)
+    }
+}
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/ExtensionGithubApi.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/ExtensionGithubApi.kt
@@ -7,46 +7,50 @@ package suwayomi.tachidesk.manga.impl.extension.github
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import com.github.salomonbrys.kotson.int
-import com.github.salomonbrys.kotson.string
-import com.google.gson.JsonArray
-import com.google.gson.JsonParser
 import eu.kanade.tachiyomi.network.NetworkHelper
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.parseAs
+import kotlinx.serialization.Serializable
 import okhttp3.Request
 import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MAX
 import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MIN
 import suwayomi.tachidesk.manga.model.dataclass.ExtensionDataClass
 import uy.kohesive.injekt.injectLazy
 
 object ExtensionGithubApi {
-    private const val BASE_URL = "https://raw.githubusercontent.com"
-    private const val REPO_URL_PREFIX = "$BASE_URL/tachiyomiorg/tachiyomi-extensions/repo"
+    private const val REPO_URL_PREFIX = "https://raw.githubusercontent.com/tachiyomiorg/tachiyomi-extensions/repo/"
 
-    private fun parseResponse(json: JsonArray): List<OnlineExtension> {
-        return json
-            .map { it.asJsonObject }
-            .filter { element ->
-                val versionName = element["version"].string
-                val libVersion = versionName.substringBeforeLast('.').toDouble()
-                libVersion in LIB_VERSION_MIN..LIB_VERSION_MAX
-            }
-            .map { element ->
-                val name = element["name"].string.substringAfter("Tachiyomi: ")
-                val pkgName = element["pkg"].string
-                val apkName = element["apk"].string
-                val versionName = element["version"].string
-                val versionCode = element["code"].int
-                val lang = element["lang"].string
-                val nsfw = element["nsfw"].int == 1
-                val icon = "$REPO_URL_PREFIX/icon/${apkName.replace(".apk", ".png")}"
+    @Serializable
+    private data class ExtensionJsonObject(
+        val name: String,
+        val pkg: String,
+        val apk: String,
+        val lang: String,
+        val code: Int,
+        val version: String,
+        val nsfw: Int,
+        val hasReadme: Int = 0,
+        val hasChangelog: Int = 0,
+        val sources: List<ExtensionSourceJsonObject>?,
+    )
 
-                OnlineExtension(name, pkgName, versionName, versionCode, lang, nsfw, apkName, icon)
-            }
-    }
+    @Serializable
+    private data class ExtensionSourceJsonObject(
+        val name: String,
+        val lang: String,
+        val id: Long,
+        val baseUrl: String
+    )
 
     suspend fun findExtensions(): List<OnlineExtension> {
-        val response = getRepo()
-        return parseResponse(response)
+        val request = Request.Builder()
+            .url("$REPO_URL_PREFIX/index.min.json")
+            .build()
+
+        return client.newCall(request)
+            .await()
+            .parseAs<List<ExtensionJsonObject>>()
+            .toExtensions()
     }
 
     fun getApkUrl(extension: ExtensionDataClass): String {
@@ -65,12 +69,37 @@ object ExtensionGithubApi {
             .build()
     }
 
-    private fun getRepo(): JsonArray {
-        val request = Request.Builder()
-            .url("$REPO_URL_PREFIX/index.min.json")
-            .build()
+    private fun List<ExtensionJsonObject>.toExtensions(): List<OnlineExtension> {
+        return this
+            .filter {
+                val libVersion = it.version.substringBeforeLast('.').toDouble()
+                libVersion in LIB_VERSION_MIN..LIB_VERSION_MAX
+            }
+            .map {
+                OnlineExtension(
+                    name = it.name.substringAfter("Tachiyomi: "),
+                    pkgName = it.pkg,
+                    versionName = it.version,
+                    versionCode = it.code,
+                    lang = it.lang,
+                    isNsfw = it.nsfw == 1,
+                    hasReadme = it.hasReadme == 1,
+                    hasChangelog = it.hasChangelog == 1,
+                    sources = it.sources?.toExtensionSources() ?: emptyList(),
+                    apkName = it.apk,
+                    iconUrl = "${REPO_URL_PREFIX}icon/${it.apk.replace(".apk", ".png")}"
+                )
+            }
+    }
 
-        val response = client.newCall(request).execute().use { response -> response.body!!.string() }
-        return JsonParser.parseString(response).asJsonArray
+    private fun List<ExtensionSourceJsonObject>.toExtensionSources(): List<OnlineExtensionSource> {
+        return this.map {
+            OnlineExtensionSource(
+                name = it.name,
+                lang = it.lang,
+                id = it.id,
+                baseUrl = it.baseUrl
+            )
+        }
     }
 }
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/OnlineExtension.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/OnlineExtension.kt
@@ -7,13 +7,23 @@ package suwayomi.tachidesk.manga.impl.extension.github
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+data class OnlineExtensionSource(
+    val name: String,
+    val lang: String,
+    val id: Long,
+    val baseUrl: String
+)
+
 data class OnlineExtension(
     val name: String,
     val pkgName: String,
-    val versionName: String,
-    val versionCode: Int,
+    val apkName: String,
     val lang: String,
+    val versionCode: Int,
+    val versionName: String,
     val isNsfw: Boolean,
-    val apkName: String,
+    val hasReadme: Boolean,
+    val hasChangelog: Boolean,
+    val sources: List<OnlineExtensionSource>,
     val iconUrl: String
 )