Fixes from 16-rc1 (#2142)

Author: Secozzi

app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt

@@ -1293,7 +1293,9 @@ class PlayerViewModel @JvmOverloads constructor(
         getHosterVideoLinksJob = viewModelScope.launchIO {
             _hosterState.update { _ ->
                 hosterList.map { hoster ->
-                    if (hoster.videoList == null) {
+                    if (hoster.lazy) {
+                        HosterState.Idle(hoster.hosterName)
+                    } else if (hoster.videoList == null) {
                         HosterState.Loading(hoster.hosterName)
                     } else {
                         val videoList = hoster.videoList!!
@@ -1468,7 +1470,11 @@ class PlayerViewModel @JvmOverloads constructor(
                 _hosterState.updateAt(index, HosterState.Loading(hosterName))
 
                 viewModelScope.launchIO {
-                    val hosterState = EpisodeLoader.loadHosterVideos(currentSource.value!!, hosterList.value[index])
+                    val hosterState = EpisodeLoader.loadHosterVideos(
+                        source = currentSource.value!!,
+                        hoster = hosterList.value[index],
+                        force = true,
+                    )
                     _hosterState.updateAt(index, hosterState)
                 }
             }

app/src/main/java/eu/kanade/tachiyomi/ui/player/loader/EpisodeLoader.kt

@@ -64,7 +64,11 @@ class EpisodeLoader {
          */
         private suspend fun getHostersOnHttp(episode: Episode, source: AnimeHttpSource): List<Hoster> {
             // TODO(1.6): Remove else block when dropping support for ext lib <1.6
-            return if (source.javaClass.declaredMethods.any { it.name == "getHosterList" }) {
+            return if (source.javaClass.declaredMethods.any {
+                    it.name in
+                        listOf("getHosterList", "hosterListRequest", "hosterListParse")
+                }
+            ) {
                 source.getHosterList(episode.toSEpisode())
                     .let { source.run { it.sortHosters() } }
             } else {
@@ -130,12 +134,18 @@ class EpisodeLoader {
          * @param hoster the hoster.
          */
         private suspend fun getVideos(source: AnimeSource, hoster: Hoster): List<Video> {
-            return when {
+            val videos = when {
                 hoster.videoList != null && source is AnimeHttpSource -> hoster.videoList!!.parseVideoUrls(source)
                 hoster.videoList != null -> hoster.videoList!!
                 source is AnimeHttpSource -> getVideosOnHttp(source, hoster)
                 else -> error("source not supported")
             }
+
+            return if (source is AnimeHttpSource) {
+                source.run { videos.sortVideos() }
+            } else {
+                videos
+            }
         }
 
         /**
@@ -146,7 +156,6 @@ class EpisodeLoader {
          */
         private suspend fun getVideosOnHttp(source: AnimeHttpSource, hoster: Hoster): List<Video> {
             return source.getVideoList(hoster)
-                .let { source.run { it.sortVideos() } }
                 .parseVideoUrls(source)
         }
 
@@ -160,7 +169,11 @@ class EpisodeLoader {
             }
         }
 
-        suspend fun loadHosterVideos(source: AnimeSource, hoster: Hoster): HosterState {
+        suspend fun loadHosterVideos(source: AnimeSource, hoster: Hoster, force: Boolean = false): HosterState {
+            if (!force && hoster.lazy) {
+                return HosterState.Idle(hoster.hosterName)
+            }
+
             return try {
                 val videos = getVideos(source, hoster)
                 HosterState.Ready(hoster.hosterName, videos, List(videos.size) { Video.State.QUEUE })

core/common/src/main/java/eu/kanade/tachiyomi/network/Requests.kt

@@ -7,8 +7,10 @@ import okhttp3.FormBody
 import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
+import okhttp3.Response
 import java.util.concurrent.TimeUnit.MINUTES
 
 private val DEFAULT_CACHE_CONTROL = CacheControl.Builder().maxAge(10, MINUTES).build()
@@ -79,3 +81,56 @@ fun DELETE(
         .cacheControl(cache)
         .build()
 }
+
+/**
+ * Send a GET request
+ *
+ * @since extensions-lib 16
+ *
+ * @param url [String]          the url to send the request to
+ * @param headers [Headers]     the request headers, defaults to the headers generated by HttpSource.headersBuilder()
+ * @param cache [CacheControl]  the cache used, defaults to the one provided by the app
+ */
+suspend fun OkHttpClient.get(
+    url: String,
+    headers: Headers = DEFAULT_HEADERS,
+    cache: CacheControl = DEFAULT_CACHE_CONTROL,
+): Response {
+    return newCall(GET(url, headers, cache)).awaitSuccess()
+}
+
+/**
+ * Send a GET request
+ *
+ * @since extensions-lib 16
+ *
+ * @param url [HttpUrl]         the url to send the request to
+ * @param headers [Headers]     the request headers, defaults to the headers generated by HttpSource.headersBuilder()
+ * @param cache [CacheControl]  the cache used, defaults to the one provided by the app
+ */
+suspend fun OkHttpClient.get(
+    url: HttpUrl,
+    headers: Headers = DEFAULT_HEADERS,
+    cache: CacheControl = DEFAULT_CACHE_CONTROL,
+): Response {
+    return newCall(GET(url, headers, cache)).awaitSuccess()
+}
+
+/**
+ * Send a POST request
+ *
+ * @since extensions-lib 16
+ *
+ * @param url [String]          the url to send the request to
+ * @param headers [Headers]     the request headers, defaults to the headers generated by HttpSource.headersBuilder()
+ * @param body [RequestBody]    the request body, defaults to the one provided by the app
+ * @param cache [CacheControl]  the cache used, defaults to the one provided by the app
+ */
+suspend fun OkHttpClient.post(
+    url: String,
+    headers: Headers = DEFAULT_HEADERS,
+    body: RequestBody = DEFAULT_BODY,
+    cache: CacheControl = DEFAULT_CACHE_CONTROL,
+): Response {
+    return newCall(POST(url, headers, body, cache)).awaitSuccess()
+}

gradle/kotlinx.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-kotlin_version = "2.1.10"
-serialization_version = "1.8.0"
+kotlin_version = "2.2.0"
+serialization_version = "1.9.0"
 xml_serialization_version = "0.90.3"
 
 [libraries]
@@ -29,4 +29,4 @@ serialization = ["serialization-json", "serialization-json-okio", "serialization
 [plugins]
 android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin_version" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin_version" }
-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin_version" }
+serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin_version" }

source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/animesource/model/Hoster.kt

@@ -11,6 +11,7 @@ open class Hoster(
     val hosterName: String = "",
     val videoList: List<Video>? = null,
     val internalData: String = "",
+    val lazy: Boolean = false,
 ) {
     @Transient
     @Volatile
@@ -28,8 +29,9 @@ open class Hoster(
         hosterName: String = this.hosterName,
         videoList: List<Video>? = this.videoList,
         internalData: String = this.internalData,
+        lazy: Boolean = this.lazy,
     ): Hoster {
-        return Hoster(hosterUrl, hosterName, videoList, internalData)
+        return Hoster(hosterUrl, hosterName, videoList, internalData, lazy)
     }
 
     companion object {
@@ -53,6 +55,7 @@ data class SerializableHoster(
     val hosterName: String = "",
     val videoList: String? = null,
     val internalData: String = "",
+    val lazy: Boolean = false,
 ) {
     companion object {
         fun List<Hoster>.serialize(): String =
@@ -63,6 +66,7 @@ data class SerializableHoster(
                         host.hosterName,
                         host.videoList?.serialize(),
                         host.internalData,
+                        host.lazy,
                     )
                 },
             )
@@ -75,6 +79,7 @@ data class SerializableHoster(
                         sHost.hosterName,
                         sHost.videoList?.toVideoList(),
                         sHost.internalData,
+                        sHost.lazy,
                     )
                 }
     }

source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/animesource/model/Video.kt

@@ -26,7 +26,7 @@ data class TimeStamp(
     val type: ChapterType = ChapterType.Other,
 )
 
-open class Video(
+data class Video(
     var videoUrl: String = "",
     val videoTitle: String = "",
     val resolution: Int? = null,
@@ -41,8 +41,6 @@ open class Video(
     val ffmpegVideoArgs: List<Pair<String, String>> = emptyList(),
     val internalData: String = "",
     val initialized: Boolean = false,
-    // TODO(1.6): Remove after ext lib bump
-    val videoPageUrl: String = "",
 ) {
 
     // TODO(1.6): Remove after ext lib bump
@@ -51,10 +49,12 @@ open class Video(
         get() = videoTitle
 
     // TODO(1.6): Remove after ext lib bump
-    @Deprecated("Use videoPageUrl instead", ReplaceWith("videoPageUrl"))
     val url: String
         get() = videoPageUrl
 
+    // TODO(1.6): Remove after ext lib bump
+    private var videoPageUrl: String = ""
+
     // TODO(1.6): Remove after ext lib bump
     constructor(
         url: String,
@@ -64,45 +64,14 @@ open class Video(
         subtitleTracks: List<Track> = emptyList(),
         audioTracks: List<Track> = emptyList(),
     ) : this(
-        videoPageUrl = url,
         videoTitle = quality,
         videoUrl = videoUrl ?: "null",
         headers = headers,
         subtitleTracks = subtitleTracks,
         audioTracks = audioTracks,
-    )
-
-    // TODO(1.6): Remove after ext lib bump
-    constructor(
-        videoUrl: String = "",
-        videoTitle: String = "",
-        resolution: Int? = null,
-        bitrate: Int? = null,
-        headers: Headers? = null,
-        preferred: Boolean = false,
-        subtitleTracks: List<Track> = emptyList(),
-        audioTracks: List<Track> = emptyList(),
-        timestamps: List<TimeStamp> = emptyList(),
-        mpvArgs: List<Pair<String, String>> = emptyList(),
-        ffmpegStreamArgs: List<Pair<String, String>> = emptyList(),
-        ffmpegVideoArgs: List<Pair<String, String>> = emptyList(),
-        internalData: String = "",
-    ) : this(
-        videoUrl = videoUrl,
-        videoTitle = videoTitle,
-        resolution = resolution,
-        bitrate = bitrate,
-        headers = headers,
-        preferred = preferred,
-        subtitleTracks = subtitleTracks,
-        audioTracks = audioTracks,
-        timestamps = timestamps,
-        mpvArgs = mpvArgs,
-        ffmpegStreamArgs = ffmpegStreamArgs,
-        ffmpegVideoArgs = ffmpegVideoArgs,
-        internalData = internalData,
-        videoPageUrl = "",
-    )
+    ) {
+        this.videoPageUrl = url
+    }
 
     // TODO(1.6): Remove after ext lib bump
     @Suppress("UNUSED_PARAMETER")
@@ -121,74 +90,6 @@ open class Video(
             field = value
         }
 
-    fun copy(
-        videoUrl: String = this.videoUrl,
-        videoTitle: String = this.videoTitle,
-        resolution: Int? = this.resolution,
-        bitrate: Int? = this.bitrate,
-        headers: Headers? = this.headers,
-        preferred: Boolean = this.preferred,
-        subtitleTracks: List<Track> = this.subtitleTracks,
-        audioTracks: List<Track> = this.audioTracks,
-        timestamps: List<TimeStamp> = this.timestamps,
-        mpvArgs: List<Pair<String, String>> = this.mpvArgs,
-        ffmpegStreamArgs: List<Pair<String, String>> = this.ffmpegStreamArgs,
-        ffmpegVideoArgs: List<Pair<String, String>> = this.ffmpegVideoArgs,
-        internalData: String = this.internalData,
-    ): Video {
-        return Video(
-            videoUrl = videoUrl,
-            videoTitle = videoTitle,
-            resolution = resolution,
-            bitrate = bitrate,
-            headers = headers,
-            preferred = preferred,
-            subtitleTracks = subtitleTracks,
-            audioTracks = audioTracks,
-            timestamps = timestamps,
-            mpvArgs = mpvArgs,
-            ffmpegStreamArgs = ffmpegStreamArgs,
-            ffmpegVideoArgs = ffmpegVideoArgs,
-            internalData = internalData,
-        )
-    }
-
-    fun copy(
-        videoUrl: String = this.videoUrl,
-        videoTitle: String = this.videoTitle,
-        resolution: Int? = this.resolution,
-        bitrate: Int? = this.bitrate,
-        headers: Headers? = this.headers,
-        preferred: Boolean = this.preferred,
-        subtitleTracks: List<Track> = this.subtitleTracks,
-        audioTracks: List<Track> = this.audioTracks,
-        timestamps: List<TimeStamp> = this.timestamps,
-        mpvArgs: List<Pair<String, String>> = this.mpvArgs,
-        ffmpegStreamArgs: List<Pair<String, String>> = this.ffmpegStreamArgs,
-        ffmpegVideoArgs: List<Pair<String, String>> = this.ffmpegVideoArgs,
-        internalData: String = this.internalData,
-        initialized: Boolean = this.initialized,
-        videoPageUrl: String = this.videoPageUrl,
-    ): Video {
-        return Video(
-            videoUrl = videoUrl,
-            videoTitle = videoTitle,
-            resolution = resolution,
-            bitrate = bitrate,
-            headers = headers,
-            preferred = preferred,
-            subtitleTracks = subtitleTracks,
-            audioTracks = audioTracks,
-            timestamps = timestamps,
-            mpvArgs = mpvArgs,
-            ffmpegStreamArgs = ffmpegStreamArgs,
-            ffmpegVideoArgs = ffmpegVideoArgs,
-            internalData = internalData,
-            initialized = initialized,
-            videoPageUrl = videoPageUrl,
-        )
-    }
-
     enum class State {
         QUEUE,
         LOAD_VIDEO,
@@ -217,8 +118,6 @@ data class SerializableVideo(
     val ffmpegVideoArgs: List<Pair<String, String>> = emptyList(),
     val internalData: String = "",
     val initialized: Boolean = false,
-    // TODO(1.6): Remove after ext lib bump
-    val videoPageUrl: String = "",
 ) {
 
     companion object {
@@ -240,7 +139,6 @@ data class SerializableVideo(
                         vid.ffmpegVideoArgs,
                         vid.internalData,
                         vid.initialized,
-                        vid.videoPageUrl,
                     )
                 },
             )
@@ -265,7 +163,6 @@ data class SerializableVideo(
                         sVid.ffmpegVideoArgs,
                         sVid.internalData,
                         sVid.initialized,
-                        sVid.videoPageUrl,
                     )
                 }
     }

source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/animesource/online/AnimeHttpSource.kt

@@ -469,7 +469,7 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      * @param video the chapter whose page list has to be fetched
      */
     protected open fun videoUrlRequest(video: Video): Request {
-        return GET(video.videoPageUrl, headers)
+        return GET(video.url, headers)
     }
 
     /**