gracefully convert json config to json5

badasintended · Aug 8, 2024 · cddc322 · cddc322
1 parent d8736fa
commit cddc322
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -161,6 +161,7 @@ dependencies {
     val minecraftlessImplementation by configurations
 
     minecraftlessImplementation("com.google.code.gson:gson:2.8.9")
+    minecraftlessImplementation("commons-io:commons-io:2.11.0")
     minecraftlessImplementation("org.jetbrains:annotations:24.1.0")
 
     testImplementation(platform("org.junit:junit-bom:5.10.2"))

diff --git a/src/main/java/mcp/mobius/waila/config/JsonConfig.java b/src/main/java/mcp/mobius/waila/config/JsonConfig.java
@@ -24,6 +24,7 @@
 import mcp.mobius.waila.mcless.config.ConfigIo;
 import mcp.mobius.waila.util.CachedSupplier;
 import mcp.mobius.waila.util.Log;
+import org.apache.commons.io.FilenameUtils;
 import org.jetbrains.annotations.Nullable;
 
 public class JsonConfig<T> implements IJsonConfig<T> {
@@ -100,7 +101,7 @@ public void backup(@Nullable String cause) {
     public static class Builder<T> implements Builder0<T>, Builder1<T> {
 
         final Type type;
-        Path path;
+        Supplier<Path> path;
         boolean json5;
         Function<String, @Nullable String> commenter;
         Gson gson;
@@ -130,19 +131,29 @@ public Builder(Type type) {
 
         @Override
         public Builder1<T> file(File file) {
-            this.path = file.toPath();
+            this.path = file::toPath;
             return this;
         }
 
         @Override
         public Builder1<T> file(Path path) {
-            this.path = path;
+            this.path = () -> path;
             return this;
         }
 
         @Override
         public Builder1<T> file(String fileName) {
-            this.path = Waila.CONFIG_DIR.resolve(fileName + (fileName.endsWith(".json") ? "" : ".json"));
+            this.path = () -> {
+                var path = fileName;
+                if (json5) {
+                    if (!path.endsWith(".json5")) path += ".json5";
+                } else {
+                    if (!path.endsWith(".json")) path += ".json";
+                }
+
+                return Waila.CONFIG_DIR.resolve(path);
+            };
+
             return this;
         }
 
@@ -181,7 +192,7 @@ public Builder1<T> gson(Gson gson) {
         @Override
         public IJsonConfig<T> build() {
             Preconditions.checkNotNull(factory, "Default value factory must not be null");
-            return new JsonConfig<>(path, type, factory, json5, commenter, gson, currentVersion, versionGetter, versionSetter);
+            return new JsonConfig<>(path.get(), type, factory, json5, commenter, gson, currentVersion, versionGetter, versionSetter);
         }
 
     }

diff --git a/src/main/java/mcp/mobius/waila/config/PluginConfig.java b/src/main/java/mcp/mobius/waila/config/PluginConfig.java
@@ -27,7 +27,7 @@ public enum PluginConfig implements IPluginConfig {
 
     private static final Log LOG = Log.create();
 
-    private static final Path PATH = Waila.CONFIG_DIR.resolve(WailaConstants.NAMESPACE + "/" + WailaConstants.WAILA + "_plugins.json");
+    private static final Path PATH = Waila.CONFIG_DIR.resolve(WailaConstants.NAMESPACE + "/" + WailaConstants.WAILA + "_plugins.json5");
     private static final ConfigIo<Map<String, Map<String, JsonElement>>> IO = new ConfigIo<>(
         LOG::warn, LOG::error,
         true,

diff --git a/src/main/java/mcp/mobius/waila/gui/widget/CategoryEntry.java b/src/main/java/mcp/mobius/waila/gui/widget/CategoryEntry.java
@@ -26,6 +26,10 @@ public class CategoryEntry extends ConfigListWidget.Entry {
         .file(WailaConstants.NAMESPACE + "/category_entries")
         .json5()
         .factory(HashMap::new)
+        .commenter(p -> !p.equals("$") ? null : """
+            This config controls the category entries collapsed state.
+            You shouldn't edit this config by hand.
+            """)
         .build();
 
     public final Component title;

diff --git a/src/minecraftless/java/mcp/mobius/waila/mcless/config/ConfigIo.java b/src/minecraftless/java/mcp/mobius/waila/mcless/config/ConfigIo.java
@@ -20,6 +20,7 @@
 import mcp.mobius.waila.mcless.json5.Json5MapTypeAdapterFactory;
 import mcp.mobius.waila.mcless.json5.Json5Reader;
 import mcp.mobius.waila.mcless.json5.Json5Writer;
+import org.apache.commons.io.FilenameUtils;
 import org.jetbrains.annotations.Nullable;
 
 public class ConfigIo<T> {
@@ -61,6 +62,20 @@ public T read(Path path) {
         T config;
         var init = true;
         if (!Files.exists(path)) {
+            if (json5) {
+                var pathString = path.toString();
+                if (FilenameUtils.getExtension(pathString).equals("json5")) {
+                    var jsonPath = path.resolveSibling(FilenameUtils.getBaseName(pathString) + ".json");
+                    try {
+                        Files.copy(jsonPath, path);
+                        Files.delete(jsonPath);
+                        return read(path);
+                    } catch (IOException e) {
+                        error.accept("Failed to move " + path + " to " + jsonPath, e);
+                    }
+                }
+            }
+
             var parent = path.getParent();
             if (!Files.exists(parent)) {
                 try {