#289 Fix single part locale crash

superzanti · Jan 15, 2022 · c2d9371 · c2d9371
1 parent 9e051d9
commit c2d9371
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 3 deletions.
diff --git a/src/main/java/com/superzanti/serversync/config/JsonConfig.java b/src/main/java/com/superzanti/serversync/config/JsonConfig.java
@@ -114,8 +114,13 @@ public static void forServer(Path json) throws IOException {
                 hasMissingEntries = true;
             }
 
-            String[] localeParts = getString(misc, PROP_LOCALE, "en_US").split("_");
-            config.LOCALE = new Locale(localeParts[0], localeParts[1]);
+            String locale = getString(misc, PROP_LOCALE, "en_US");
+            if (locale.contains("_")) {
+                String[] localeParts = getString(misc, PROP_LOCALE, "en_US").split("_");
+                config.LOCALE = new Locale(localeParts[0], localeParts[1]);
+            } else {
+                config.LOCALE = new Locale(locale);
+            }
 
             if (hasMissingEntries) {
                 // Generate a new config if we failed to read parts of it

diff --git a/src/test/java/com/superzanti/serversync/config/JsonConfigTest.java b/src/test/java/com/superzanti/serversync/config/JsonConfigTest.java
@@ -19,7 +19,7 @@ void beforeEach() {
     }
 
     @ParameterizedTest
-    @DisplayName("Parsing")
+    @DisplayName("Should parse")
     @ValueSource(strings = {"src/test/resources/server-config.json"})
     void parseServerConfig(Path file) {
         ServerSync.MODE = EServerMode.SERVER;
@@ -36,4 +36,18 @@ void parseServerConfig(Path file) {
             e.printStackTrace();
         }
     }
+
+    @ParameterizedTest
+    @DisplayName("Should parse single part locales")
+    @ValueSource(strings = {"src/test/resources/server-single-part-locale-config.json"})
+    void parseSinglePartLocale(Path file) {
+        ServerSync.MODE = EServerMode.SERVER;
+        try {
+            JsonConfig.forServer(file);
+            SyncConfig config = SyncConfig.getConfig();
+            assertNotNull(config.LOCALE);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/src/test/resources/server-single-part-locale-config.json b/src/test/resources/server-single-part-locale-config.json
@@ -0,0 +1,45 @@
+{
+  "general": {
+    "push_client_mods": false,
+    "sync_mode": 2
+  },
+  "connection": {
+    "port": 38067,
+    "buffer": 65536
+  },
+  "rules": {
+    "directories": [
+      {
+        "path": "test-mirror",
+        "mode": "mirror"
+      },
+      {
+        "path": "test-push",
+        "mode": "push"
+      },
+      "test-default"
+    ],
+    "files": {
+      "include": [],
+      "ignore": [
+        {
+          "description": "No jar files allowed",
+          "pattern": "**/*.jar"
+        },
+        {
+          "pattern": "**/other.bing"
+        },
+        "**/basic.thing"
+      ],
+      "redirect": [
+        {
+          "pattern": "**/*.jar",
+          "redirectTo": "redirected-files"
+        }
+      ]
+    }
+  },
+  "misc": {
+    "locale": "en"
+  }
+}