Merge from mihon & introduce new aniyomi functions

.gitignore

@@ -1,9 +1,13 @@
+# Build files
 .gradle
-/local.properties
-/.idea/workspace.xml
-.DS_Store
-/build
-.idea/
-*iml
-*.iml
-*/build
+.kotlin
+build
+
+# IDE files
+.idea
+
+# Configuration files
+local.properties
+
+# macOS specific files
+.DS_Store

build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.dokkatoo) apply false
+    alias(libs.plugins.binary.compatibility.validator) apply false
 }
 
 tasks.register<Delete>("clean") {

gradle/libs.versions.toml

@@ -1,23 +1,26 @@
 [versions]
 agp_version = "8.2.1"
 coroutines_version = "1.7.1"
-kotlin_version = "1.9.21"
-serialization_version = "1.5.1"
+kotlin_version = "2.1.0"
+serialization_version = "1.8.0"
 dokkatoo_version = "2.1.0"
+binary_compat_validator_version = "0.17.0"
 
 [libraries]
 coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines_version" }
 
 kotlin-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_version" }
 kotlin-json-okio = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-okio", version.ref = "serialization_version" }
 
-injekt-core = { module = "com.github.inorichi.injekt:injekt-core", version = "65b0440" }
-jsoup = { module = "org.jsoup:jsoup", version = "1.16.1" }
-okhttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.11" }
+injekt-core = { module = "com.github.mihonapp:injekt", version = "91edab2317" }
+jsoup = { module = "org.jsoup:jsoup", version = "1.18.3" }
+ksoup = { module = "com.fleeksoft.ksoup:ksoup", version = "0.2.1" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.14" }
 rxandroid = { module = "io.reactivex:rxandroid", version = "1.2.1" }
 rxjava = { module = "io.reactivex:rxjava", version = "1.3.8" }
 
 [plugins]
 android-library = { id = "com.android.library", version.ref = "agp_version" }
 dokkatoo = { id = "dev.adamko.dokkatoo", version.ref = "dokkatoo_version" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin_version" }
+binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary_compat_validator_version" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

library/build.gradle.kts

@@ -6,9 +6,10 @@ plugins {
     alias(libs.plugins.kotlin.android)
     `maven-publish`
     alias(libs.plugins.dokkatoo)
+    alias(libs.plugins.binary.compatibility.validator)
 }
 
-val ver = "14"
+val ver = "16-rc1"
 version = ver
 group = "com.github.aniyomiorg"
 
@@ -35,11 +36,19 @@ android {
     kotlinOptions {
         jvmTarget = javaVersion.toString()
     }
+
+    publishing {
+        singleVariant("release") {
+            withJavadocJar()
+            withSourcesJar()
+        }
+    }
 }
 
 dependencies {
     compileOnly(libs.okhttp)
     compileOnly(libs.jsoup)
+    compileOnly(libs.ksoup)
     compileOnly(libs.rxjava)
     compileOnly(libs.rxandroid)
     compileOnly(libs.injekt.core)
@@ -111,6 +120,7 @@ dokkatoo {
 publishing {
     publications {
         create<MavenPublication>("maven") {
+            groupId = "com.github.aniyomiorg"
             artifactId = "extensions-lib"
 
             afterEvaluate {

library/src/main/java/aniyomix/source/model/Hoster.kt

@@ -0,0 +1,32 @@
+@file:Suppress("UNUSED")
+
+package aniyomix.source.model
+
+import eu.kanade.tachiyomi.animesource.model.Video
+
+/**
+ * Data class for representing a hoster
+ *
+ * @since extensions-lib 16
+ *
+ * @property hosterUrl    url of hoster
+ * @property hosterName   name of hoster
+ * @property videoList    initial list of videos, if any
+ * @property internalData data used by the extension. Useful for getting videos
+ */
+data class Hoster(
+    val hosterUrl: String = "",
+    val hosterName: String = "",
+    val videoList: List<Video>? = null,
+    val internalData: String = "",
+) {
+    /**
+     * Used for sites that doesn't have the concept of hosters. To use this, return a list of a
+     * single hoster, with `hosterName` set to `Hoster.NO_HOSTER_LIST` and a non-null video list.
+     *
+     * @since extensions-lib 16
+     */
+    companion object {
+        const val NO_HOSTER_LIST = "no_hoster_list"
+    }
+}

library/src/main/java/aniyomix/utils/coroutines.kt

@@ -0,0 +1,36 @@
+package aniyomix.utils
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.withContext
+
+/**
+ * Parallel implementation of [Iterable.map].
+ *
+ * @since extensions-lib 16
+ */
+suspend inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
+    withContext(Dispatchers.IO) {
+        map { async { f(it) } }.awaitAll()
+    }
+
+/**
+ * Parallel implementation of [Iterable.mapNotNull].
+ *
+ * @since extensions-lib 16
+ */
+suspend inline fun <A, B> Iterable<A>.parallelMapNotNull(crossinline f: suspend (A) -> B?): List<B> =
+    withContext(Dispatchers.IO) {
+        map { async { f(it) } }.awaitAll().filterNotNull()
+    }
+
+/**
+ * Parallel implementation of [Iterable.flatMap].
+ *
+ * @since extensions-lib 16
+ */
+suspend inline fun <A, B> Iterable<A>.parallelFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
+    withContext(Dispatchers.IO) {
+        map { async { f(it) } }.awaitAll().flatten()
+    }

library/src/main/java/eu/kanade/tachiyomi/AppInfo.kt

@@ -11,13 +11,13 @@ object AppInfo {
      *
      * @since extension-lib 13
      */
-    fun getVersionCode(): Int = throw Exception("Stub!")
+    fun getVersionCode(): Int = throw RuntimeException("Stub!")
 
     /**
      * Version name of the host application. May be useful for sharing as User-Agent information.
      * Note that this value differs between forks so logic should not rely on it.
      *
      * @since extension-lib 13
      */
-    fun getVersionName(): String = throw Exception("Stub!")
+    fun getVersionName(): String = throw RuntimeException("Stub!")
 }

library/src/main/java/eu/kanade/tachiyomi/animesource/AnimeCatalogueSource.kt

@@ -1,73 +1,71 @@
+@file:Suppress("UNUSED")
+
 package eu.kanade.tachiyomi.animesource
 
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
-import rx.Observable
 
+@Deprecated(
+    message = "Use the base AnimeSource class instead",
+    replaceWith = ReplaceWith(
+        expression = "AnimeSource",
+        imports = ["eu.kanade.tachiyomi.animesource.AnimeSource"]
+    )
+)
 interface AnimeCatalogueSource : AnimeSource {
 
-    /**
-     * An ISO 639-1 compliant language code (two letters in lower case).
-     */
-    val lang: String
+    override val language: String get() = throw RuntimeException("Stub!")
 
-    /**
-     * Whether the source has support for latest updates.
-     */
-    val supportsLatest: Boolean
+    override val hasLatestListing: Boolean get() = throw RuntimeException("Stub!")
 
-    /**
-     * Get a page with a list of anime.
-     *
-     * @since extensions-lib 14
-     * @param page the page number to retrieve.
-     */
-    suspend fun getPopularAnime(page: Int): AnimesPage {
-       throw Exception("Stub!") 
-    }
+    override suspend fun getSearchFilters(): AnimeFilterList = throw RuntimeException("Stub!")
+
+    override suspend fun getDefaultAnimeList(page: Int): AnimesPage = throw RuntimeException("Stub!")
+
+    override suspend fun getLatestAnimeList(page: Int): AnimesPage = throw RuntimeException("Stub!")
+
+    override suspend fun getAnimeList(
+        query: String,
+        filters: AnimeFilterList?,
+        page: Int
+    ): AnimesPage = throw RuntimeException("Stub!")
 
     /**
-     * Get a page with a list of anime.
-     *
-     * @since extensions-lib 14
-     * @param page the page number to retrieve.
-     * @param query the search query.
-     * @param filters the list of filters to apply.
+     * An ISO 639-1 compliant language code (two letters in lower case).
      */
-    suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
-        throw Exception("Stub!")
-    }
+    @Deprecated("Use language instead", ReplaceWith("language"))
+    val lang: String get() = throw RuntimeException("Stub!")
 
     /**
-     * Get a page with a list of latest anime updates.
-     *
-     * @since extensions-lib 14
-     * @param page the page number to retrieve.
+     * Whether the source has support for latest updates.
      */
-    suspend fun getLatestUpdates(page: Int): AnimesPage {
-        throw Exception("Stub!")
-    }
+    @Deprecated("Use hasLatestListing instead", ReplaceWith("hasLatestListing"))
+    val supportsLatest: Boolean get() = throw RuntimeException("Stub!")
 
     /**
      * Returns the list of filters for the source.
      */
-    fun getFilterList(): AnimeFilterList
+    @Deprecated("Use the new suspend API instead", ReplaceWith("getSearchFilters"))
+    fun getFilterList(): AnimeFilterList = throw RuntimeException("Stub!")
 
     @Deprecated(
-        "Use the non-RxJava API instead",
-        ReplaceWith("getPopularAnime"),
+        message = "Use getDefaultAnimeList instead",
+        level = DeprecationLevel.ERROR,
+        replaceWith = ReplaceWith("getDefaultAnimeList")
     )
-    fun fetchPopularAnime(page: Int): Observable<AnimesPage>
+    suspend fun getPopularAnime(page: Int): AnimesPage = throw RuntimeException("Stub!")
 
     @Deprecated(
-        "Use the non-RxJava API instead",
-        ReplaceWith("getSearchAnime"),
+        message = "Use getLatestAnimeList instead",
+        level = DeprecationLevel.ERROR,
+        replaceWith = ReplaceWith("getLatestAnimeList")
     )
-    fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage>
+    suspend fun getLatestUpdates(page: Int): AnimesPage = throw RuntimeException("Stub!")
 
     @Deprecated(
-        "Use the non-RxJava API instead",
-        ReplaceWith("getLatestUpdates"),
+        message = "Use getAnimeList instead",
+        level = DeprecationLevel.ERROR,
+        replaceWith = ReplaceWith("getAnimeList(query, filters, page)")
     )
-    fun fetchLatestUpdates(page: Int): Observable<AnimesPage>
+    suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage = throw RuntimeException("Stub!")
 }