lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化 Java 下载功能 (#3342)

Browse Source 
* update

* update
This commit is contained in:
Glavo
2024-10-15 18:47:57 +08:00
committed by GitHub
parent 32c3b694b3
commit 5b345affec
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoFetchJavaListTask.java
View File

@@ -79,7 +79,7 @@ public final class DiscoFetchJavaListTask extends Task<TreeMap<Integer, DiscoJav
TreeMap<Integer, DiscoJavaRemoteVersion> map = new TreeMap<>(); TreeMap<Integer, DiscoJavaRemoteVersion> map = new TreeMap<>();
for (DiscoJavaRemoteVersion version : result) { for (DiscoJavaRemoteVersion version : result) {
if (!distribution.getApiParameter().equals(version.getDistribution())) if (!distribution.testVersion(version))
continue; continue;
int jdkVersion = version.getJdkVersion(); int jdkVersion = version.getJdkVersion();

19
HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoJavaDistribution.java
View File

@@ -46,7 +46,16 @@ public enum DiscoJavaDistribution implements JavaDistribution<DiscoJavaRemoteVer
EnumSet.of(JDK, JRE, JDKFX, JREFX), EnumSet.of(JDK, JRE, JDKFX, JREFX),
pair(WINDOWS, EnumSet.of(X86_64, X86, ARM64)), pair(WINDOWS, EnumSet.of(X86_64, X86, ARM64)),
pair(LINUX, EnumSet.of(X86_64, X86, ARM64, ARM32, RISCV64, PPC64LE)), pair(LINUX, EnumSet.of(X86_64, X86, ARM64, ARM32, RISCV64, PPC64LE)),
pair(OSX, EnumSet.of(X86_64, ARM64))), pair(OSX, EnumSet.of(X86_64, ARM64))) {
@Override
public boolean testVersion(DiscoJavaRemoteVersion version) {
if (!super.testVersion(version))
return false;
String fileName = version.getFileName();
return !fileName.endsWith("-lite.tar.gz") && !fileName.endsWith("-lite.zip");
}
},
ZULU("Zulu", "zulu", "Azul", ZULU("Zulu", "zulu", "Azul",
EnumSet.of(JDK, JRE, JDKFX, JREFX), EnumSet.of(JDK, JRE, JDKFX, JREFX),
pair(WINDOWS, EnumSet.of(X86_64, X86, ARM64)), pair(WINDOWS, EnumSet.of(X86_64, X86, ARM64)),
@@ -54,8 +63,8 @@ public enum DiscoJavaDistribution implements JavaDistribution<DiscoJavaRemoteVer
pair(OSX, EnumSet.of(X86_64, ARM64))), pair(OSX, EnumSet.of(X86_64, ARM64))),
GRAALVM("GraalVM", "graalvm", "Oracle", GRAALVM("GraalVM", "graalvm", "Oracle",
EnumSet.of(JDK), EnumSet.of(JDK),
pair(WINDOWS, EnumSet.of(X86_64, X86)), pair(WINDOWS, EnumSet.of(X86_64)),
pair(LINUX, EnumSet.of(X86_64, X86, ARM64, ARM32, RISCV64, PPC64LE)), pair(LINUX, EnumSet.of(X86_64, ARM64)),
pair(OSX, EnumSet.of(X86_64, ARM64))); pair(OSX, EnumSet.of(X86_64, ARM64)));
public static DiscoJavaDistribution of(String name) { public static DiscoJavaDistribution of(String name) {
@@ -113,4 +122,8 @@ public enum DiscoJavaDistribution implements JavaDistribution<DiscoJavaRemoteVer
public Task<TreeMap<Integer, DiscoJavaRemoteVersion>> getFetchJavaVersionsTask(DownloadProvider provider, Platform platform, JavaPackageType packageType) { public Task<TreeMap<Integer, DiscoJavaRemoteVersion>> getFetchJavaVersionsTask(DownloadProvider provider, Platform platform, JavaPackageType packageType) {
return new DiscoFetchJavaListTask(provider, this, platform, packageType); return new DiscoFetchJavaListTask(provider, this, platform, packageType);
} }
public boolean testVersion(DiscoJavaRemoteVersion version) {
return this.getApiParameter().equals(version.getDistribution());
}
} }