From a0ddaf6766ca2a7ae4a62e484c6189b6466a7c66 Mon Sep 17 00:00:00 2001 From: Glavo Date: Mon, 4 Aug 2025 20:28:46 +0800 Subject: [PATCH] =?UTF-8?q?GetTask=20=E5=BA=94=E5=BD=93=E9=81=B5=E5=BE=AA?= =?UTF-8?q?=20Content-Type=20=E4=B8=AD=E7=9A=84=E5=AD=97=E7=AC=A6=E9=9B=86?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20(#4183)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HMCLCore/src/main/java/org/jackhuang/hmcl/task/GetTask.java | 4 +--- .../main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) 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 ff20730db..ebf430e5a 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/GetTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/GetTask.java @@ -29,8 +29,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -import static java.nio.charset.StandardCharsets.UTF_8; - /** * @author huangyuhui */ @@ -74,7 +72,7 @@ public final class GetTask extends FetchTask { public void close() throws IOException { if (!isSuccess()) return; - String result = baos.toString(UTF_8); + String result = baos.toString(NetworkUtils.getCharsetFromContentType(connection.getContentType())); setResult(result); if (checkETag) { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java index 50effea53..cbd6e0a72 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java @@ -303,7 +303,7 @@ public final class NetworkUtils { static final Pattern CHARSET_REGEX = Pattern.compile("\\s*(charset)\\s*=\\s*['|\"]?(?[^\"^';,]+)['|\"]?"); - static Charset getCharsetFromContentType(String contentType) { + public static Charset getCharsetFromContentType(String contentType) { if (contentType == null || contentType.isBlank()) return UTF_8;