AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-18 00:10:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

add: retry other download source in auto installation

Browse Source
This commit is contained in:
huanghongxun 2020-03-22 13:19:43 +08:00
parent b3bf9d5c94
commit e68a3c7cd4
12 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java
View File

@ -79,6 +79,7 @@ public class BMCLAPIDownloadProvider implements DownloadProvider {
@Override
public String injectURL(String baseURL) {
return baseURL
.replace("https://bmclapi2.bangbang93.com", apiRoot)
.replace("https://launchermeta.mojang.com", apiRoot)
.replace("https://launcher.mojang.com", apiRoot)
.replace("https://libraries.minecraft.net", apiRoot + "/libraries")

9
HMCLCore/src/main/java/org/jackhuang/hmcl/download/DownloadProvider.java
View File

@ -17,9 +17,6 @@
*/
package org.jackhuang.hmcl.download;
import java.util.Arrays;
import java.util.stream.Stream;
/**
* The service provider that provides Minecraft online file downloads.
*
@ -42,12 +39,6 @@ public interface DownloadProvider {
*/
String injectURL(String baseURL);
default Stream<String> injectURLs(String[] baseURLs) {
Stream<String> urls = Arrays.stream(baseURLs);
Stream<String> jsonURLs = Arrays.stream(baseURLs).map(this::injectURL);
return Stream.concat(jsonURLs, urls);
}
/**
* the specific version list that this download provider provides. i.e. "forge", "liteloader", "game", "optifine"
*

5
HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricInstallTask.java
View File

@ -31,6 +31,7 @@ import org.jackhuang.hmcl.util.gson.JsonUtils;
import org.jackhuang.hmcl.util.io.NetworkUtils;
import java.util.*;
import java.util.stream.Collectors;
/**
* <b>Note</b>: Fabric should be installed first.
@ -50,7 +51,9 @@ public final class FabricInstallTask extends Task<Version> {
this.version = version;
this.remote = remoteVersion;
launchMetaTask = new GetTask(NetworkUtils.toURL(dependencyManager.getPrimaryDownloadProvider().injectURL(getLaunchMetaUrl(remote.getGameVersion(), remote.getSelfVersion()))))
launchMetaTask = new GetTask(dependencyManager.getPreferredDownloadProviders().stream()
.map(downloadProvider -> downloadProvider.injectURL(getLaunchMetaUrl(remote.getGameVersion(), remote.getSelfVersion())))
.map(NetworkUtils::toURL).collect(Collectors.toList()))
.setCacheRepository(dependencyManager.getCacheRepository());
}

12
HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeBMCLVersionList.java
View File

@ -30,11 +30,7 @@ import org.jackhuang.hmcl.util.io.NetworkUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.*;
import static org.jackhuang.hmcl.util.Lang.mapOf;
import static org.jackhuang.hmcl.util.Pair.pair;
@ -92,9 +88,9 @@ public final class ForgeBMCLVersionList extends VersionList<ForgeRemoteVersion>
+ (StringUtils.isNotBlank(version.getBranch()) ? "-" + version.getBranch() : "");
String fileName1 = "forge-" + classifier + "-" + file.getCategory() + "." + file.getFormat();
String fileName2 = "forge-" + classifier + "-" + gameVersion + "-" + file.getCategory() + "." + file.getFormat();
urls.add(apiRoot + "/maven/net/minecraftforge/forge/" + classifier + "-" + gameVersion + "/" + fileName2);
urls.add(apiRoot + "/maven/net/minecraftforge/forge/" + classifier + "/" + fileName1);
urls.add(NetworkUtils.withQuery(apiRoot + "/forge/download", mapOf(
urls.add("https://files.minecraftforge.net/maven/net/minecraftforge/forge/" + classifier + "-" + gameVersion + "/" + fileName2);
urls.add("https://files.minecraftforge.net/maven/net/minecraftforge/forge/" + classifier + "/" + fileName1);
urls.add(NetworkUtils.withQuery("https://bmclapi2.bangbang93.com/forge/download", mapOf(
pair("mcversion", version.getGameVersion()),
pair("version", version.getVersion()),
pair("branch", version.getBranch()),

6
HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeInstallTask.java
View File

@ -68,9 +68,9 @@ public final class ForgeInstallTask extends Task<Version> {
installer = Files.createTempFile("forge-installer", ".jar");
dependent = new FileDownloadTask(
Arrays.stream(remote.getUrl())
.map(NetworkUtils::toURL)
.collect(Collectors.toList()),
dependencyManager.getPreferredDownloadProviders().stream()
.flatMap(downloadProvider -> Arrays.stream(remote.getUrl()).map(downloadProvider::injectURL))
.map(NetworkUtils::toURL).collect(Collectors.toList()),
installer.toFile(), null)
.setCacheRepository(dependencyManager.getCacheRepository())
.setCaching(true);

5
HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameDownloadTask.java
View File

@ -29,6 +29,7 @@ import java.io.File;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
/**
* Task to download Minecraft jar
@ -58,7 +59,9 @@ public final class GameDownloadTask extends Task<Void> {
File jar = dependencyManager.getGameRepository().getVersionJar(version);
FileDownloadTask task = new FileDownloadTask(
NetworkUtils.toURL(dependencyManager.getPrimaryDownloadProvider().injectURL(version.getDownloadInfo().getUrl())),
dependencyManager.getPreferredDownloadProviders().stream()
.map(downloadProvider -> downloadProvider.injectURL(version.getDownloadInfo().getUrl()))
.map(NetworkUtils::toURL).collect(Collectors.toList()),
jar,
IntegrityCheck.of(CacheRepository.SHA1, version.getDownloadInfo().getSha1()))
.setCaching(true)

10
HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/VersionJsonDownloadTask.java
View File

@ -25,13 +25,12 @@ import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.io.NetworkUtils;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
import static java.nio.charset.StandardCharsets.UTF_8;
/**
*
* @author huangyuhui
@ -69,8 +68,9 @@ public final class VersionJsonDownloadTask extends Task<String> {
RemoteVersion remoteVersion = gameVersionList.getVersion(gameVersion, gameVersion)
.orElseThrow(() -> new IOException("Cannot find specific version " + gameVersion + " in remote repository"));
dependencies.add(new GetTask(
dependencyManager.getPrimaryDownloadProvider().injectURLs(remoteVersion.getUrl())
.map(NetworkUtils::toURL).collect(Collectors.toList()),
UTF_8).storeTo(this::setResult));
dependencyManager.getPreferredDownloadProviders().stream()
.flatMap(downloadProvider -> Arrays.stream(remoteVersion.getUrl()).map(downloadProvider::injectURL))
.map(NetworkUtils::toURL).collect(Collectors.toList())
).storeTo(this::setResult));
}
}

4
HMCLCore/src/main/java/org/jackhuang/hmcl/download/liteloader/LiteLoaderBMCLVersionList.java
View File

@ -91,7 +91,7 @@ public final class LiteLoaderBMCLVersionList extends VersionList<LiteLoaderRemot
continue;
String version = v.getVersion();
String url = downloadProvider.getApiRoot() + "/liteloader/download?version=" + version;
String url = "https://bmclapi2.bangbang93.com/liteloader/download?version=" + version;
if (snapshot) {
try {
version = version.replace("SNAPSHOT", getLatestSnapshotVersion(repository.getUrl() + "com/mumfrey/liteloader/" + v.getVersion() + "/"));
@ -101,7 +101,7 @@ public final class LiteLoaderBMCLVersionList extends VersionList<LiteLoaderRemot
}
versions.put(key, new LiteLoaderRemoteVersion(gameVersion,
version, downloadProvider.injectURL(url),
version, url,
v.getTweakClass(), v.getLibraries()
));
}

8
HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineBMCLVersionList.java
View File

@ -26,11 +26,7 @@ import org.jackhuang.hmcl.util.gson.JsonUtils;
import org.jackhuang.hmcl.util.io.NetworkUtils;
import org.jackhuang.hmcl.util.versioning.VersionNumber;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
/**
*
@ -71,7 +67,7 @@ public final class OptiFineBMCLVersionList extends VersionList<OptiFineRemoteVer
}.getType());
for (OptiFineVersion element : root) {
String version = element.getType() + "_" + element.getPatch();
String mirror = apiRoot + "/optifine/" + element.getGameVersion() + "/" + element.getType() + "/" + element.getPatch();
String mirror = "https://bmclapi2.bangbang93.com/optifine/" + element.getGameVersion() + "/" + element.getType() + "/" + element.getPatch();
if (!duplicates.add(mirror))
continue;

4
HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineInstallTask.java
View File

@ -96,7 +96,9 @@ public final class OptiFineInstallTask extends Task<Version> {
if (installer == null) {
dependents.add(new FileDownloadTask(
Arrays.stream(remote.getUrl()).map(NetworkUtils::toURL).collect(Collectors.toList()),
dependencyManager.getPreferredDownloadProviders().stream()
.flatMap(downloadProvider -> Arrays.stream(remote.getUrl()).map(downloadProvider::injectURL))
.map(NetworkUtils::toURL).collect(Collectors.toList()),
dest.toFile(), null)
.setCacheRepository(dependencyManager.getCacheRepository())
.setCaching(true));

2
HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java
View File

@ -207,7 +207,6 @@ public class FileDownloadTask extends Task<Void> {
checkETag = true;
}
Logging.LOG.log(Level.FINER, "Downloading " + urls.get(0) + " to " + file);
Exception exception = null;
URL failedURL = null;
@ -217,6 +216,7 @@ public class FileDownloadTask extends Task<Void> {
break;
}
Logging.LOG.log(Level.FINER, "Downloading " + url + " to " + file);
Path temp = null;
try {

25
HMCLCore/src/main/java/org/jackhuang/hmcl/task/GetTask.java
View File

@ -53,22 +53,21 @@ public final class GetTask extends Task<String> {
}
public GetTask(URL url, Charset charset) {
this(url, charset, 5);
this(url, charset, 3);
}
public GetTask(URL url, Charset charset, int retry) {
this.urls = Collections.singletonList(url);
this.charset = charset;
this.retry = retry;
setName(url.toString());
setExecutor(Schedulers.io());
this(Collections.singletonList(url), charset, retry);
}
public GetTask(List<URL> urls, Charset charset) {
public GetTask(List<URL> url) {
this(url, UTF_8, 3);
}
public GetTask(List<URL> urls, Charset charset, int retry) {
this.urls = new ArrayList<>(urls);
this.charset = charset;
this.retry = urls.size();
this.retry = retry;
setName(urls.get(0).toString());
setExecutor(Schedulers.io());
@ -84,8 +83,12 @@ public final class GetTask extends Task<String> {
Exception exception = null;
URL failedURL = null;
boolean checkETag = true;
for (int time = 0; time < retry; ++time) {
URL url = urls.get(time % urls.size());
for (int time = 0; time < retry * urls.size(); ++time) {
URL url = urls.get(time / retry);
if (isCancelled()) {
break;
}
try {
updateProgress(0);
HttpURLConnection conn = NetworkUtils.createConnection(url);