From 081f01b9aec360fef7da396ae0ee8728dfbe5fe5 Mon Sep 17 00:00:00 2001 From: Glavo Date: Fri, 1 Aug 2025 22:42:14 +0800 Subject: [PATCH] update --- .../main/java/org/jackhuang/hmcl/task/CacheFileTask.java | 8 ++++++-- .../src/main/java/org/jackhuang/hmcl/task/FetchTask.java | 4 ++-- .../java/org/jackhuang/hmcl/task/FileDownloadTask.java | 2 +- .../src/main/java/org/jackhuang/hmcl/task/GetTask.java | 2 -- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/CacheFileTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/CacheFileTask.java index d34d1e3dc..389c4bbac 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/CacheFileTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/CacheFileTask.java @@ -35,7 +35,12 @@ import static org.jackhuang.hmcl.util.logging.Logger.LOG; * * @author Glavo */ -public class CacheFileTask extends FetchTask { +public final class CacheFileTask extends FetchTask { + + public CacheFileTask(@NotNull URI uri) { + super(List.of(uri), DEFAULT_RETRY); + } + public CacheFileTask(@NotNull URI uri, int retry) { super(List.of(uri), retry); } @@ -103,5 +108,4 @@ public class CacheFileTask extends FetchTask { } }; } - } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FetchTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FetchTask.java index 69bd6e8eb..15402087d 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FetchTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FetchTask.java @@ -44,6 +44,8 @@ import static org.jackhuang.hmcl.util.Lang.threadPool; import static org.jackhuang.hmcl.util.logging.Logger.LOG; public abstract class FetchTask extends Task { + protected static final int DEFAULT_RETRY = 3; + protected final List uris; protected final int retry; protected CacheRepository repository = CacheRepository.getInstance(); @@ -60,8 +62,6 @@ public abstract class FetchTask extends Task { setExecutor(download()); } - - public void setCacheRepository(CacheRepository repository) { this.repository = repository; } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java index 35c750146..ec6895aa0 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java @@ -133,7 +133,7 @@ public class FileDownloadTask extends FetchTask { * @param integrityCheck the integrity check to perform, null if no integrity check is to be performed */ public FileDownloadTask(List uris, Path path, IntegrityCheck integrityCheck) { - this(uris, path, integrityCheck, 3); + this(uris, path, integrityCheck, DEFAULT_RETRY); } /** diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/GetTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/GetTask.java index c0fab32db..119b8f42a 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/GetTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/GetTask.java @@ -36,8 +36,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; */ public final class GetTask extends FetchTask { - private static final int DEFAULT_RETRY = 3; - private final Charset charset; public GetTask(URI url) {