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

Fix #4572: Use String::lines to handle line separators on various OS (#4575)

Browse Source 
Co-authored-by: Glavo <zjx001202@gmail.com>
This commit is contained in:
Burning_TNT
2025-10-03 19:59:43 +08:00
committed by GitHub
parent 87af44328b
commit 365bb089c5
1 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
HMCLCore/src/main/java/org/jackhuang/hmcl/util/i18n/LocaleUtils.java
View File

@@ -17,17 +17,24 @@
*/ */
package org.jackhuang.hmcl.util.i18n; package org.jackhuang.hmcl.util.i18n;
import org.jackhuang.hmcl.util.Lang;
import org.jackhuang.hmcl.util.StringUtils; import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.io.IOUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.Unmodifiable; import org.jetbrains.annotations.Unmodifiable;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.*; import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -50,46 +57,41 @@ public final class LocaleUtils {
private static final Map<String, String> iso3To2 = new HashMap<>(); private static final Map<String, String> iso3To2 = new HashMap<>();
static { static {
try (InputStream input = LocaleUtils.class.getResourceAsStream("/assets/lang/sublanguages.csv")) { try {
if (input != null) { for (String line : Lang.toIterable(IOUtils.readFullyAsString(LocaleUtils.class.getResourceAsStream("/assets/lang/sublanguages.csv")).lines())) {
new String(input.readAllBytes()).lines() if (line.startsWith("#") || line.isBlank()) {
.filter(line -> !line.startsWith("#") && !line.isBlank()) continue;
.forEach(line -> { }
String[] languages = line.split(",");
if (languages.length < 2)
LOG.warning("Invalid line in sublanguages.csv: " + line);
String parent = languages[0]; String[] languages = line.split(",");
for (int i = 1; i < languages.length; i++) { if (languages.length < 2) {
subLanguageToParent.put(languages[i], parent); LOG.warning("Invalid line in sublanguages.csv: " + line);
} continue;
}); }
String parent = languages[0];
for (int i = 1; i < languages.length; i++) {
subLanguageToParent.put(languages[i], parent);
}
} }
} catch (Throwable e) { } catch (Throwable e) {
LOG.warning("Failed to load sublanguages.csv", e); LOG.warning("Failed to load sublanguages.csv", e);
} }
// Line Format: try {
// (?<iso2>[a-z]{2}),(?<iso3>[a-z]{3}) // Line Format: (?<iso2>[a-z]{2}),(?<iso3>[a-z]{3})
try (InputStream input = LocaleUtils.class.getResourceAsStream("/assets/lang/iso_languages.csv")) { for (String line : Lang.toIterable(IOUtils.readFullyAsString(LocaleUtils.class.getResourceAsStream("/assets/lang/iso_languages.csv")).lines())) {
if (input != null) { if (line.startsWith("#") || line.isBlank()) {
int lineLength = 2 + 1 + 3; continue;
byte[] bytes = input.readAllBytes();
for (int offset = 0; offset < bytes.length; ) {
if (offset > bytes.length - lineLength)
break;
if (bytes[offset + 2] != ',')
throw new IOException("iso_languages.csv format invalid");
String iso2 = new String(bytes, offset, 2, StandardCharsets.US_ASCII);
String iso3 = new String(bytes, offset + 3, 3, StandardCharsets.US_ASCII);
iso3To2.put(iso3, iso2);
offset += (lineLength + 1);
} }
String[] parts = line.split(",", 3);
if (parts.length != 2) {
LOG.warning("Invalid line in iso_languages.csv: " + line);
continue;
}
iso3To2.put(parts[1], parts[0]);
} }
} catch (Throwable e) { } catch (Throwable e) {
LOG.warning("Failed to load iso_languages.csv", e); LOG.warning("Failed to load iso_languages.csv", e);