Merge branch 'pr/299' into dev

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

@@ -1,6 +1,8 @@
 package eu.kanade.tachiyomi.extension.anime.api
 
 import android.content.Context
+import ani.dantotsu.settings.saving.PrefManager
+import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.util.Logger
 import eu.kanade.tachiyomi.extension.ExtensionUpdateNotifier
 import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
@@ -32,42 +34,36 @@ internal class AnimeExtensionGithubApi {
         preferenceStore.getLong("last_ext_check", 0)
     }
 
-    private var requiresFallbackSource = false
-
     suspend fun findExtensions(): List<AnimeExtension.Available> {
         return withIOContext {
-            val githubResponse = if (requiresFallbackSource) {
-                null
-            } else {
+
+            val extensions: ArrayList<AnimeExtension.Available> = arrayListOf()
+
+            PrefManager.getVal<Set<String>>(PrefName.AnimeExtensionRepos).forEach {
                 try {
-                    networkService.client
-                        .newCall(GET("${REPO_URL_PREFIX}index.min.json"))
-                        .awaitSuccess()
+                    val githubResponse =
+                        networkService.client
+                            .newCall(GET("${it}/index.min.json"))
+                            .awaitSuccess()
+
+                    val repoExtensions = with(json) {
+                        githubResponse
+                            .parseAs<List<AnimeExtensionJsonObject>>()
+                            .toExtensions(it)
+                    }
+
+                    // Sanity check - a small number of extensions probably means something broke
+                    // with the repo generator
+                    if (repoExtensions.size < 10) {
+                        throw Exception()
+                    }
+
+                    extensions.addAll(repoExtensions)
                 } catch (e: Throwable) {
                     Logger.log("Failed to get extensions from GitHub")
-                    requiresFallbackSource = true
-                    null
                 }
             }
 
-            val response = githubResponse ?: run {
-                networkService.client
-                    .newCall(GET("${FALLBACK_REPO_URL_PREFIX}index.min.json"))
-                    .awaitSuccess()
-            }
-
-            val extensions = with(json) {
-                response
-                    .parseAs<List<AnimeExtensionJsonObject>>()
-                    .toExtensions()
-            }
-
-            // Sanity check - a small number of extensions probably means something broke
-            // with the repo generator
-            if (extensions.size < 10) {
-                throw Exception()
-            }
-
             extensions
         }
     }
@@ -111,7 +107,7 @@ internal class AnimeExtensionGithubApi {
         return extensionsWithUpdate
     }
 
-    private fun List<AnimeExtensionJsonObject>.toExtensions(): List<AnimeExtension.Available> {
+    private fun List<AnimeExtensionJsonObject>.toExtensions(repository: String): List<AnimeExtension.Available> {
         return this
             .filter {
                 val libVersion = it.extractLibVersion()
@@ -130,7 +126,8 @@ internal class AnimeExtensionGithubApi {
                     hasChangelog = it.hasChangelog == 1,
                     sources = it.sources?.toAnimeExtensionSources().orEmpty(),
                     apkName = it.apk,
-                    iconUrl = "${getUrlPrefix()}icon/${it.pkg}.png",
+                    repository = repository,
+                    iconUrl = "${repository}/icon/${it.pkg}.png",
                 )
             }
     }
@@ -147,15 +144,7 @@ internal class AnimeExtensionGithubApi {
     }
 
     fun getApkUrl(extension: AnimeExtension.Available): String {
-        return "${getUrlPrefix()}apk/${extension.apkName}"
-    }
-
-    private fun getUrlPrefix(): String {
-        return if (requiresFallbackSource) {
-            FALLBACK_REPO_URL_PREFIX
-        } else {
-            REPO_URL_PREFIX
-        }
+        return "${extension.repository}/apk/${extension.apkName}"
     }
 }
 
@@ -163,11 +152,6 @@ private fun AnimeExtensionJsonObject.extractLibVersion(): Double {
     return version.substringBeforeLast('.').toDouble()
 }
 
-private const val REPO_URL_PREFIX =
-    "https://raw.githubusercontent.com/aniyomiorg/aniyomi-extensions/repo/"
-private const val FALLBACK_REPO_URL_PREFIX =
-    "https://gcore.jsdelivr.net/gh/aniyomiorg/aniyomi-extensions@repo/"
-
 @Serializable
 private data class AnimeExtensionJsonObject(
     val name: String,

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

@@ -47,6 +47,7 @@ sealed class AnimeExtension {
         val sources: List<AvailableAnimeSources>,
         val apkName: String,
         val iconUrl: String,
+        val repository: String
     ) : AnimeExtension()
 
     data class Untrusted(

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

@@ -1,6 +1,8 @@
 package eu.kanade.tachiyomi.extension.manga.api
 
 import android.content.Context
+import ani.dantotsu.settings.saving.PrefManager
+import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.util.Logger
 import eu.kanade.tachiyomi.extension.ExtensionUpdateNotifier
 import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
@@ -32,42 +34,37 @@ internal class MangaExtensionGithubApi {
         preferenceStore.getLong("last_ext_check", 0)
     }
 
-    private var requiresFallbackSource = false
-
     suspend fun findExtensions(): List<MangaExtension.Available> {
         return withIOContext {
-            val githubResponse = if (requiresFallbackSource) {
-                null
-            } else {
+
+            val extensions: ArrayList<MangaExtension.Available> = arrayListOf()
+
+
+            PrefManager.getVal<Set<String>>(PrefName.MangaExtensionRepos).forEach {
                 try {
-                    networkService.client
-                        .newCall(GET("${REPO_URL_PREFIX}index.min.json"))
-                        .awaitSuccess()
+                    val githubResponse =
+                        networkService.client
+                            .newCall(GET("${it}/index.min.json"))
+                            .awaitSuccess()
+
+                    val repoExtensions = with(json) {
+                        githubResponse
+                            .parseAs<List<ExtensionJsonObject>>()
+                            .toExtensions(it)
+                    }
+
+                    // Sanity check - a small number of extensions probably means something broke
+                    // with the repo generator
+                    if (repoExtensions.size < 10) {
+                        throw Exception()
+                    }
+
+                    extensions.addAll(repoExtensions)
                 } catch (e: Throwable) {
                     Logger.log("Failed to get extensions from GitHub")
-                    requiresFallbackSource = true
-                    null
                 }
             }
 
-            val response = githubResponse ?: run {
-                networkService.client
-                    .newCall(GET("${FALLBACK_REPO_URL_PREFIX}index.min.json"))
-                    .awaitSuccess()
-            }
-
-            val extensions = with(json) {
-                response
-                    .parseAs<List<ExtensionJsonObject>>()
-                    .toExtensions()
-            }
-
-            // Sanity check - a small number of extensions probably means something broke
-            // with the repo generator
-            if (extensions.size < 100) {
-                throw Exception()
-            }
-
             extensions
         }
     }
@@ -110,7 +107,7 @@ internal class MangaExtensionGithubApi {
         return extensionsWithUpdate
     }
 
-    private fun List<ExtensionJsonObject>.toExtensions(): List<MangaExtension.Available> {
+    private fun List<ExtensionJsonObject>.toExtensions(repository: String): List<MangaExtension.Available> {
         return this
             .filter {
                 val libVersion = it.extractLibVersion()
@@ -129,7 +126,8 @@ internal class MangaExtensionGithubApi {
                     hasChangelog = it.hasChangelog == 1,
                     sources = it.sources?.toExtensionSources().orEmpty(),
                     apkName = it.apk,
-                    iconUrl = "${getUrlPrefix()}icon/${it.pkg}.png",
+                    repository = repository,
+                    iconUrl = "${repository}/icon/${it.pkg}.png",
                 )
             }
     }
@@ -146,15 +144,7 @@ internal class MangaExtensionGithubApi {
     }
 
     fun getApkUrl(extension: MangaExtension.Available): String {
-        return "${getUrlPrefix()}apk/${extension.apkName}"
-    }
-
-    private fun getUrlPrefix(): String {
-        return if (requiresFallbackSource) {
-            FALLBACK_REPO_URL_PREFIX
-        } else {
-            REPO_URL_PREFIX
-        }
+        return "${extension.repository}/apk/${extension.apkName}"
     }
 
     private fun ExtensionJsonObject.extractLibVersion(): Double {
@@ -162,10 +152,6 @@ internal class MangaExtensionGithubApi {
     }
 }
 
-private const val REPO_URL_PREFIX = "https://raw.githubusercontent.com/keiyoushi/extensions/main/"
-private const val FALLBACK_REPO_URL_PREFIX =
-    "https://gcore.jsdelivr.net/gh/keiyoushi/extensions@main/"
-
 @Serializable
 private data class ExtensionJsonObject(
     val name: String,

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

@@ -47,6 +47,7 @@ sealed class MangaExtension {
         val sources: List<AvailableMangaSources>,
         val apkName: String,
         val iconUrl: String,
+        val repository: String
     ) : MangaExtension()
 
     data class Untrusted(