[media] 优先选择在线数据源, 默认只启用 Nyafun, Mikan CN 与动漫花园. close #371

open-ani · Jun 3, 2024 · 5b5efaa · 5b5efaa
1 parent f652a95
commit 5b5efaa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/app/shared/data/common/data/media/selector/MediaSelector.kt b/app/shared/data/common/data/media/selector/MediaSelector.kt
@@ -415,11 +415,10 @@ class DefaultMediaSelector(
                 return@sequence
             }
             val fallback = mergedPreference.fallbackMediaSourceIds
-            if (fallback == null) {
-                yield(null)
-            } else {
-                yieldAll(fallback)
+            if (fallback != null) {
+                yieldAll(fallback) // 如果有设置, 那就优先使用设置的
             }
+            yield(null) // 最后 (未匹配到时) 总是任意选一个
         }
 
         // For rules discussion, see #174

diff --git a/app/shared/pages/episode-play/common/mediaFetch/MediaPreference.kt b/app/shared/pages/episode-play/common/mediaFetch/MediaPreference.kt
@@ -7,6 +7,8 @@ import me.him188.ani.app.platform.Platform
 import me.him188.ani.app.platform.isDesktop
 import me.him188.ani.datasources.api.topic.Resolution
 import me.him188.ani.datasources.api.topic.SubtitleLanguage
+import me.him188.ani.datasources.dmhy.DmhyMediaSource
+import me.him188.ani.datasources.mikan.MikanCNMediaSource
 import me.him188.ani.datasources.nyafun.NyafunMediaSource
 
 /**
@@ -59,7 +61,7 @@ data class MediaPreference private constructor(
     /**
      * @see fallbackSubtitleLanguageIds
      */
-    val fallbackMediaSourceIds: List<String>? = null
+    val fallbackMediaSourceIds: List<String>? = null,
 ) {
     companion object {
         /**
@@ -70,7 +72,11 @@ data class MediaPreference private constructor(
             fallbackMediaSourceIds =
             if (Platform.currentPlatform.isDesktop())
                 listOf(NyafunMediaSource.ID) // PC 默认不启用 BT 源
-            else null,
+            else listOf(
+                NyafunMediaSource.ID,
+                MikanCNMediaSource.ID,
+                DmhyMediaSource.ID,
+            ), // TODO(3.1.0): 需要重写下数据源优先级与默认设置, 更新注释
         )
 
         /**