🎨 Merge enumeration values into string JSON

Problem:
- If `libclang` is not available for `gen_str_catalog.py`, it is possible to
  provide (by fixed manual input) the `enums` part of the JSON output. When
  `libclang` is available, this input would be discarded -- regardless of
  whether it contains enum keys which aren't from parsing.

Solution:
- Merge the dictionaries for the parsed enum values.

Author: elbeno

test/log/catalog_extra.json

@@ -1,3 +1,11 @@
 {
-    "extra_key": "extra_value"
+    "extra_key": "extra_value",
+    "enums": {
+        "ns::E": {
+            "17": "extra_value"
+        },
+        "extra_enum": {
+            "1": "value"
+        }
+    }
 }

tools/gen_str_catalog.py

@@ -204,15 +204,20 @@ def write_json(messages, modules, enums, extra_inputs: list[str], filename: str,
         if not mod in d["modules"]:
             d["modules"].append(mod)
 
-    es = dict()
-    for (k, (_, v)) in enums.items():
-        es.update({k: {value: name for (name, value) in v.items()}})
-
-    str_catalog = dict(**d, enums=es)
+    str_catalog = dict(**d, enums=dict())
     for extra in extra_inputs:
         with open(extra, "r") as f:
             str_catalog.update(json.load(f))
 
+    es = dict()
+    for (k, (_, v)) in enums.items():
+        es.update({k: {value: name for (name, value) in v.items()}})
+    for (k, v) in es.items():
+        if k in str_catalog["enums"]:
+            str_catalog["enums"][k].update(v) # type: ignore
+        else:
+            str_catalog["enums"].update({k: v}) # type: ignore
+
     with open(filename, "w") as f:
         json.dump(str_catalog, f, indent=4)