regex set-count

Author: tylerguy

src/main/java/de/pdinklag/mcstats/RegexSetCountReader.java

@@ -0,0 +1,54 @@
+package de.pdinklag.mcstats;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.regex.Pattern;
+
+/**
+ * Reads a set of strings whose keys match a regular expression.
+ */
+public class RegexSetCountReader extends NestedDataReader {
+    private final Pattern[] patterns;
+
+    /**
+     * Constructs a regex set count reader.
+     *
+     * @param path     The JSON object names on the path to the set to read.
+     * @param patterns The regular expression patterns to match the keys against.
+     */
+    public RegexSetCountReader(String[] path, String[] patterns) {
+        super(path);
+        this.patterns = new Pattern[patterns.length];
+        for (int i = 0; i < patterns.length; i++) {
+            this.patterns[i] = Pattern.compile(patterns[i]);
+        }
+    }
+
+    @Override
+    protected DataValue getDefaultValue() {
+        return new StringSetValue();
+    }
+
+    @Override
+    protected DataValue read(JSONObject obj, String key) {
+        final StringSetValue set = new StringSetValue();
+        final JSONObject sub = obj.optJSONObject(key);
+        if (sub != null) {
+            for (String subKey : sub.keySet()) {
+                for (Pattern pattern : patterns) {
+                    if (pattern.matcher(subKey).matches()) {
+                        set.add(subKey);
+                        break;
+                    }
+                }
+            }
+        }
+        return set;
+    }
+
+    @Override
+    public DataAggregator createDefaultAggregator() {
+        return new StringSetUnionAggregator();
+    }
+}

src/main/java/de/pdinklag/mcstats/StatParser.java

@@ -50,9 +50,24 @@ private static SetCountReader parseSetCountReader(JSONObject obj) throws JSONExc
         return new SetCountReader(path);
     }
 
+    private static RegexSetCountReader parseRegexSetCountReader(JSONObject obj) throws JSONException {
+        JSONArray jsonPath = obj.getJSONArray("path");
+        String[] path = new String[jsonPath.length()];
+        for (int i = 0; i < path.length; i++) {
+            path[i] = jsonPath.getString(i);
+        }
+
+        JSONArray jsonPatterns = obj.getJSONArray("patterns");
+        String[] patterns = new String[jsonPatterns.length()];
+        for (int i = 0; i < patterns.length; i++) {
+            patterns[i] = jsonPatterns.getString(i);
+        }
+        return new RegexSetCountReader(path, patterns);
+    }
+
     private static DataReader parseReader(JSONObject obj) throws JSONException, StatParseException {
         String type = obj.getString("$type");
-        switch(type) {
+        switch (type) {
             case "int":
                 return parseIntReader(obj);
             case "sum":
@@ -61,6 +76,8 @@ private static DataReader parseReader(JSONObject obj) throws JSONException, Stat
                 return parseMatchSumReader(obj);
             case "set-count":
                 return parseSetCountReader(obj);
+            case "regex-set-count":
+                return parseRegexSetCountReader(obj);
             default:
                 throw new StatParseException("unsupported reader type: " + type);
         }

stats/advancement.json

@@ -2,7 +2,8 @@
     "id": "advancement",
     "unit": "int",
     "reader": {
-        "$type": "set-count",
-        "path": ["advancements"]
+        "$type": "regex-set-count",
+        "path": ["advancements"],
+        "patterns": ["^minecraft:(story|nether|end|adventure|husbandry)"]
         }
     }