fix(video-list): Properly call sortVideos/sort (#2058)

Co-authored-by: jmir1 <[email protected]>

Author: cuong-tran

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

@@ -66,8 +66,11 @@ class EpisodeLoader {
             // TODO(1.6): Remove else block when dropping support for ext lib <1.6
             return if (source.javaClass.declaredMethods.any { it.name == "getHosterList" }) {
                 source.getHosterList(episode.toSEpisode())
+                    .let { source.run { it.sortHosters() } }
             } else {
-                source.getVideoList(episode.toSEpisode()).toHosterList()
+                source.getVideoList(episode.toSEpisode())
+                    .let { source.run { it.sortVideos() } }
+                    .toHosterList()
             }
         }
 
@@ -142,7 +145,9 @@ class EpisodeLoader {
          * @param hoster the hoster.
          */
         private suspend fun getVideosOnHttp(source: AnimeHttpSource, hoster: Hoster): List<Video> {
-            return source.getVideoList(hoster).parseVideoUrls(source)
+            return source.getVideoList(hoster)
+                .let { source.run { it.sortVideos() } }
+                .parseVideoUrls(source)
         }
 
         // TODO(1.6): Remove after ext lib bump

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

@@ -304,7 +304,7 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
         return client.newCall(hosterListRequest(episode))
             .awaitSuccess()
             .let { response ->
-                hosterListParse(response).sortHosters()
+                hosterListParse(response)
             }
     }
 
@@ -340,7 +340,7 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
         return client.newCall(videoListRequest(hoster))
             .awaitSuccess()
             .let { response ->
-                videoListParse(response, hoster).sortVideos()
+                videoListParse(response, hoster)
             }
     }
 
@@ -385,18 +385,17 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      * @param episode the episode.
      * @return the videos for the episode.
      */
-    @Suppress("DEPRECATION")
     override suspend fun getVideoList(episode: SEpisode): List<Video> {
+        @Suppress("DEPRECATION")
         return fetchVideoList(episode).awaitSingle()
     }
 
-    @Suppress("DEPRECATION")
     @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getVideoList"))
     override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
         return client.newCall(videoListRequest(episode))
             .asObservableSuccess()
             .map { response ->
-                videoListParse(response).sort()
+                videoListParse(response)
             }
     }
 
@@ -422,7 +421,7 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      *
      * @since extensions-lib 16
      */
-    protected open fun List<Hoster>.sortHosters(): List<Hoster> {
+    open fun List<Hoster>.sortHosters(): List<Hoster> {
         return this
     }
 
@@ -431,8 +430,9 @@ abstract class AnimeHttpSource : AnimeCatalogueSource {
      *
      * @since extensions-lib 16
      */
-    protected open fun List<Video>.sortVideos(): List<Video> {
-        return this
+    open fun List<Video>.sortVideos(): List<Video> {
+        @Suppress("DEPRECATION")
+        return sort()
     }
 
     /**