Run it on the repo

NabuCasa · Aug 14, 2024 · 566e57c · 566e57c
1 parent 293a8f6
commit 566e57c
Show file tree

Hide file tree

Showing 7 changed files with 11,500 additions and 18 deletions.
diff --git a/misc/firmware-eraser/.cproject b/misc/firmware-eraser/.cproject
diff --git a/src/bootloader-uart-xmodem/.cproject b/src/bootloader-uart-xmodem/.cproject
diff --git a/src/ncp-uart-hw/.cproject b/src/ncp-uart-hw/.cproject
diff --git a/src/ot-rcp/.cproject b/src/ot-rcp/.cproject
diff --git a/src/rcp-uart-802154/.cproject b/src/rcp-uart-802154/.cproject
diff --git a/src/zwave_ncp_serial_api_controller/.cproject b/src/zwave_ncp_serial_api_controller/.cproject
diff --git a/tools/normalize_cproject.py b/tools/normalize_cproject.py
@@ -5,6 +5,11 @@
 import xml.etree.ElementTree as ET
 
 
+def json_dumps(obj: dict | list) -> str:
+    """Compactly dump JSON into a string."""
+    return json.dumps(obj, separators=(", ", ": "), indent=4)
+
+
 cproject_path = pathlib.Path(sys.argv[1])
 cproject = cproject_path.read_text()
 
@@ -20,7 +25,7 @@
         copied_files.sort(
             key=lambda f: (f["generated"], f["projectPath"], f["version"])
         )
-        storage_module.attrib["projectCommon.copiedFiles"] = json.dumps(copied_files)
+        storage_module.attrib["projectCommon.copiedFiles"] = json_dumps(copied_files)
 
     if "cppBuildConfig.projectBuiltInState" in storage_module.attrib:
         project_built_in_state = json.loads(
@@ -32,17 +37,17 @@
                 resolved_options = json.loads(state["resolvedOptionsStr"])
                 resolved_options.sort(key=lambda o: o["optionId"])
 
-                state["resolvedOptionsStr"] = json.dumps(resolved_options)
+                state["resolvedOptionsStr"] = json_dumps(resolved_options)
 
-        storage_module.attrib["cppBuildConfig.projectBuiltInState"] = json.dumps(
+        storage_module.attrib["cppBuildConfig.projectBuiltInState"] = json_dumps(
             project_built_in_state
         )
 
     if "projectCommon.referencedModules" in storage_module.attrib:
         referenced_modules = json.loads(
             storage_module.attrib["projectCommon.referencedModules"]
         )
-        storage_module.attrib["projectCommon.referencedModules"] = json.dumps(
+        storage_module.attrib["projectCommon.referencedModules"] = json_dumps(
             referenced_modules
         )
 
@@ -52,7 +57,8 @@
 
 # Replace newlines with literals!
 xml_text = xml_text.replace("&#10;", "\n")
-xml_text = xml_text.replace("\\n", "\n\\n")
+# xml_text.replace("\\n", "\n\\n")
+xml_text = re.sub(r"\s+\\n\s+", "\n\\n", xml_text, flags=re.MULTILINE)
 
 # Only touch the filesystem if we need to
 if processing_instructions + xml_text != cproject: