Add Better Extension Search (#6359)

Add support to searching with source name, id and baseUrl for a extension's sources.

app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt

@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.extension.api
 
 import android.content.Context
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.extension.model.AvailableExtensionSources
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.model.LoadResult
 import eu.kanade.tachiyomi.extension.util.ExtensionLoader
@@ -80,12 +81,23 @@ internal class ExtensionGithubApi {
                     versionCode = it.code,
                     lang = it.lang,
                     isNsfw = it.nsfw == 1,
+                    sources = it.sources.toExtensionSources(),
                     apkName = it.apk,
                     iconUrl = "${REPO_URL_PREFIX}icon/${it.apk.replace(".apk", ".png")}"
                 )
             }
     }
 
+    private fun List<ExtensionSourceJsonObject>.toExtensionSources(): List<AvailableExtensionSources> {
+        return this.map {
+            AvailableExtensionSources(
+                name = it.name,
+                id = it.id,
+                baseUrl = it.baseUrl
+            )
+        }
+    }
+
     fun getApkUrl(extension: Extension.Available): String {
         return "${REPO_URL_PREFIX}apk/${extension.apkName}"
     }
@@ -98,8 +110,17 @@ private data class ExtensionJsonObject(
     val name: String,
     val pkg: String,
     val apk: String,
-    val version: String,
-    val code: Long,
     val lang: String,
+    val code: Long,
+    val version: String,
     val nsfw: Int,
+    val sources: List<ExtensionSourceJsonObject>,
+)
+
+@Serializable
+private data class ExtensionSourceJsonObject(
+    val name: String,
+    val id: Long,
+    val baseUrl: String
+
 )

app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt

@@ -32,6 +32,7 @@ sealed class Extension {
         override val versionCode: Long,
         override val lang: String,
         override val isNsfw: Boolean,
+        val sources: List<AvailableExtensionSources>,
         val apkName: String,
         val iconUrl: String
     ) : Extension()
@@ -46,3 +47,9 @@ sealed class Extension {
         override val isNsfw: Boolean = false
     ) : Extension()
 }
+
+data class AvailableExtensionSources(
+    val name: String,
+    val id: Long,
+    val baseUrl: String
+)