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

Lifting encoding to be compatible with more Unicode characters

Browse Source
This commit is contained in:
Glavo
2021-12-13 12:54:52 +08:00
committed by Yuhui Huang
parent 76c361e9bc
commit 6176dfaaf7
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/OperatingSystem.java
View File

@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.charset.UnsupportedCharsetException; import java.nio.charset.UnsupportedCharsetException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@@ -112,15 +113,25 @@ public enum OperatingSystem {
private static final Pattern MEMINFO_PATTERN = Pattern.compile("^(?<key>.*?):\\s+(?<value>\\d+) kB?$"); private static final Pattern MEMINFO_PATTERN = Pattern.compile("^(?<key>.*?):\\s+(?<value>\\d+) kB?$");
static { static {
String nativeEncoding = System.getProperty("native.encoding", System.getProperty("sun.jnu.encoding")); String nativeEncoding = System.getProperty("native.encoding");
String hmclNativeEncoding = System.getProperty("hmcl.native.encoding");
Charset nativeCharset = Charset.defaultCharset(); Charset nativeCharset = Charset.defaultCharset();
if (nativeEncoding != null) { try {
try { if (hmclNativeEncoding != null) {
nativeCharset = Charset.forName(nativeEncoding); nativeCharset = Charset.forName(hmclNativeEncoding);
} catch (UnsupportedCharsetException e) { } else {
e.printStackTrace(); if (nativeEncoding != null && !nativeEncoding.equalsIgnoreCase(nativeCharset.name())) {
nativeCharset = Charset.forName(nativeEncoding);
}
if (nativeCharset == StandardCharsets.UTF_8 || nativeCharset == StandardCharsets.US_ASCII) {
nativeCharset = StandardCharsets.UTF_8;
} else if ("GBK".equalsIgnoreCase(nativeCharset.name())) {
nativeCharset = Charset.forName("GB18030");
}
} }
} catch (UnsupportedCharsetException e) {
e.printStackTrace();
} }
NATIVE_CHARSET = nativeCharset; NATIVE_CHARSET = nativeCharset;