Improve language loader (#153)

* Improve language loading logic

* Catch exceptions more strictly

* More lenient syntax restrictions

---------

Signed-off-by: Hendrix-Shen <[email protected]>

Author: Hendrix-Shen

magiclib-core/common/src/main/java/top/hendrixshen/magiclib/impl/i18n/provider/FileLanguageProvider.java

@@ -2,8 +2,6 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.gson.JsonSyntaxException;
-import com.google.gson.stream.MalformedJsonException;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -75,14 +73,9 @@ public Map<String, String> getLanguage(String languageCode) {
 
         this.files.getOrDefault(languageCode, Collections.emptyList()).forEach(file -> {
             try (InputStream inputStream = Files.newInputStream(file)) {
-                JsonUtil.loadStringMapFromJson(inputStream, result::put);
+                JsonUtil.loadLanguageMapFromJson(inputStream, result::put);
                 MagicLib.getLogger().debug("Loaded language file {}.", file);
             } catch (Exception e) {
-                if (e instanceof JsonSyntaxException && e.getCause() instanceof MalformedJsonException) {
-                    MagicLib.getLogger().error("Failed to load language file {}.", file);
-                    return;
-                }
-
                 MagicLib.getLogger().error("Failed to load language file {}.", file, e);
             }
         });

magiclib-core/common/src/main/java/top/hendrixshen/magiclib/impl/i18n/provider/JarLanguageProvider.java

@@ -80,20 +80,15 @@ private void loadFromJar(@NotNull JarFile jar) {
 
     @Internal
     public static boolean loadFromEntry(@NotNull ZipEntry entry, InputStream inputStream,
-                                     Function<String, Map<String, String>> languageMapGetter) {
+                                        Function<String, Map<String, String>> languageMapGetter) {
         Matcher matcher = LanguageProvider.LANGUAGE_PATH_PATTERN.matcher(entry.getName());
 
         if (!matcher.find()) {
             return false;
         }
 
         Map<String, String> language = languageMapGetter.apply(matcher.group(2));
-
-        try {
-            JsonUtil.loadStringMapFromJson(inputStream, language::put);
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
+        JsonUtil.loadLanguageMapFromJson(inputStream, language::put);
+        return true;
     }
 }

magiclib-core/common/src/main/java/top/hendrixshen/magiclib/util/JsonUtil.java

@@ -1,6 +1,8 @@
 package top.hendrixshen.magiclib.util;
 
 import com.google.gson.JsonObject;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -12,10 +14,32 @@
 
 public class JsonUtil {
     public static void loadStringMapFromJson(InputStream inputStream, BiConsumer<String, String> biConsumer) {
-        JsonObject jsonObject = GsonUtil.GSON.fromJson(new InputStreamReader(inputStream,
-                StandardCharsets.UTF_8), JsonObject.class);
-        jsonObject.entrySet().forEach(entry -> biConsumer.accept(entry.getKey(),
-                entry.getValue().getAsString()));
+        JsonUtil.loadLanguageMapFromJson(inputStream, biConsumer);
+    }
+
+    public static void loadLanguageMapFromJson(InputStream inputStream, BiConsumer<String, String> biConsumer) {
+        try (
+                InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
+                JsonReader reader = new JsonReader(inputStreamReader)
+        ) {
+            if (reader.peek() == JsonToken.BEGIN_OBJECT) {
+                reader.beginObject();
+
+                while (reader.hasNext()) {
+                    String key = reader.nextName();
+
+                    if (reader.peek() == JsonToken.STRING) {
+                        biConsumer.accept(key, reader.nextString());
+                    } else {
+                        reader.skipValue();
+                    }
+                }
+
+                reader.endObject();
+            }
+        } catch (IOException ignore) {
+            // ignore.
+        }
     }
 
     public static JsonObject readJson(@NotNull URL url) throws IOException {