修复未初始化 fileDownloadProvider 的问题 (#2906)

HMCL-dev · Mar 8, 2024 · cb4cd69 · cb4cd69
1 parent c85c074
commit cb4cd69
Showing 1 changed file with 7 additions and 17 deletions.
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/DownloadProviders.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/DownloadProviders.java
@@ -55,7 +55,6 @@ private DownloadProviders() {}
 
     private static final MojangDownloadProvider MOJANG;
     private static final BMCLAPIDownloadProvider BMCLAPI;
-    // private static final BMCLAPIDownloadProvider MCBBS;
 
     public static final String DEFAULT_PROVIDER_ID = "balanced";
     public static final String DEFAULT_RAW_PROVIDER_ID = "bmclapi";
@@ -69,27 +68,19 @@ private DownloadProviders() {}
 
         MOJANG = new MojangDownloadProvider();
         BMCLAPI = new BMCLAPIDownloadProvider(bmclapiRoot);
-        // MCBBS = new BMCLAPIDownloadProvider("https://download.mcbbs.net");
         rawProviders = mapOf(
                 pair("mojang", MOJANG),
                 pair("bmclapi", BMCLAPI)
-                // pair("mcbbs", MCBBS)
         );
 
         AdaptedDownloadProvider fileProvider = new AdaptedDownloadProvider();
-        fileProvider.setDownloadProviderCandidates(Arrays.asList(
-            // MCBBS,
-            BMCLAPI,
-            MOJANG));
-        BalancedDownloadProvider balanced = new BalancedDownloadProvider(
-            MOJANG,
-            // MCBBS,
-            BMCLAPI);
+        fileProvider.setDownloadProviderCandidates(Arrays.asList(BMCLAPI, MOJANG));
+        BalancedDownloadProvider balanced = new BalancedDownloadProvider(MOJANG, BMCLAPI);
 
         providersById = mapOf(
                 pair("official", new AutoDownloadProvider(MOJANG, fileProvider)),
                 pair("balanced", new AutoDownloadProvider(balanced, fileProvider)),
-                pair("mirror", new AutoDownloadProvider(BMCLAPI /* MCBBS */, fileProvider)));
+                pair("mirror", new AutoDownloadProvider(BMCLAPI, fileProvider)));
 
         observer = FXUtils.observeWeak(() -> {
             FetchTask.setDownloadExecutorConcurrency(
@@ -108,12 +99,11 @@ static void init() {
                     .orElse(providersById.get(DEFAULT_PROVIDER_ID));
         });
 
-        FXUtils.onChangeAndOperate(config().downloadTypeProperty(), downloadType -> {
-            if (!rawProviders.containsKey(downloadType)) {
-                config().setDownloadType(DEFAULT_RAW_PROVIDER_ID);
-                return;
-            }
+        if (!rawProviders.containsKey(config().getDownloadType())) {
+            config().setDownloadType(DEFAULT_RAW_PROVIDER_ID);
+        }
 
+        FXUtils.onChangeAndOperate(config().downloadTypeProperty(), downloadType -> {
             DownloadProvider primary = Optional.ofNullable(rawProviders.get(downloadType))
                     .orElse(rawProviders.get(DEFAULT_RAW_PROVIDER_ID));
             fileDownloadProvider.setDownloadProviderCandidates(