update to use all. fix linting a bit

Author: Ughuuu

binding_generator.py

@@ -3,10 +3,9 @@
 import json
 import re
 import shutil
-import os
+from pathlib import Path
 from compat_generator import map_header_files
 from header_matcher import match_headers
-from pathlib import Path
 
 
 def generate_mod_version(argcount, const=False, returns=False):
@@ -261,7 +260,7 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False, profil
             include_gen_folder / "classes" / "global_constants.hpp",
             include_gen_folder / "classes" / "global_constants_binds.hpp",
             include_gen_folder / "core" / "version.hpp",
-         ]:
+        ]:
             files.append(str(path.as_posix()))
     if sources:
         utility_functions_source_path = source_gen_folder / "variant" / "utility_functions.cpp"
@@ -386,7 +385,9 @@ def scons_generate_bindings(target, source, env):
     return None
 
 
-def generate_bindings(api_filepath, use_template_get_node, bits="64", precision="single", output_dir=".", godot_repo = ""):
+def generate_bindings(
+    api_filepath, use_template_get_node, bits="64", precision="single", output_dir=".", godot_repo=""
+):
     api = None
 
     target_dir = Path(output_dir) / "gen"
@@ -1552,7 +1553,8 @@ def generate_engine_classes_bindings(api, output_dir, use_template_get_node):
 
 
 def generate_compat_includes(godot_repo: Path, output_dir: Path, target_dir: Path):
-    target_dir = output_dir
+    # Uncomment this to change include files
+    # target_dir = output_dir
     file_types_mapping_godot_cpp_gen = map_header_files(target_dir)
     file_types_mapping_godot = map_header_files(godot_repo)
     # Match the headers
@@ -1575,17 +1577,19 @@ def generate_compat_includes(godot_repo: Path, output_dir: Path, target_dir: Pat
             result.append("\n")  # Blank line for separation
 
             # Insert the #ifdef block
-            result.append(f"#ifdef GODOT_MODULE_COMPAT\n")
+            result.append("#ifdef GODOT_MODULE_COMPAT\n")
             if len(file_godot_names) == 0:
                 print("No header found for", file_godot_cpp_name)
             for file_godot_name in file_godot_names:
                 result.append(f"#include <{Path(file_godot_name).as_posix()}>\n")
-            result.append(f"#else\n")
+            result.append("#else\n")
 
-            result.extend(after_marker)  # Append the remaining content inside the guard
+            for line in after_marker:
+                if line.strip() not in {"namespace godot {", "} // namespace godot"}:
+                    result.append(line)
 
             # Add the namespace and endif
-            result.append(f"#endif\n")
+            result.append("#endif\n")
 
             # Finally, append the original final #endif line
             result.append(content[last_endif_idx].strip())

compat_generator.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
+import json
 import re
 import os
-import json
 import sys
 
 
@@ -35,7 +35,7 @@ def parse_header_file(file_path):
         types["defines"] += define_matches
 
     # Debug the case where no classes or structs are found
-    #if len(types["classes"]) == 0 and len(types["structs"]) == 0 and len(types["defines"]) == 0:
+    # if len(types["classes"]) == 0 and len(types["structs"]) == 0 and len(types["defines"]) == 0:
     #    print(f"{file_path} missing things")
     return types
 
@@ -67,7 +67,7 @@ def map_header_files(directory):
     current_directory = os.path.join(os.getcwd(), "")
     mapping_name = ""
     if len(sys.argv) > 1:
-        mapping_name = f"_godot"
+        mapping_name = "_godot"
         current_directory = os.path.join(os.getcwd(), sys.argv[1])
 
     file_types_mapping = map_header_files(current_directory)

header_matcher.py

@@ -1,5 +1,6 @@
 import json
 import os
+
 from compat_generator import map_header_files
 
 def match_headers(mapping1, mapping2):