Improved jinja2 generator handling of settings starting with digits

Author: igo95862

tools/generate-settings-dataclasses-jinja.py

@@ -16,6 +16,7 @@
 import keyword
 from argparse import ArgumentParser
 from functools import cached_property
+from itertools import dropwhile
 from pathlib import Path
 from re import Pattern
 from re import compile as regex_compile
@@ -95,6 +96,10 @@
     'link-watchers': 'LinkWatchers',
 }
 
+setting_name_replacement: dict[str, str] = {
+    'x': 'eapol',
+}
+
 
 def must_replace_name(name: str) -> bool:
     return (keyword.iskeyword(name)
@@ -143,15 +148,32 @@ def __init__(self, name: str, description: str, name_upper: str,
         self.name = name
         self.description = description
         self.name_upper = name_upper
-        self.python_class_name = name.capitalize() + 'Settings'
 
         self.typing_imports = {'Optional'}
 
         self.properties: List[NmSettingPropertyIntrospection] = []
 
+    @cached_property
+    def python_class_name(self) -> str:
+
+        camel_case = ''.join(
+            map(str.title, self.snake_name.split('_'))
+        )
+
+        return camel_case + 'Settings'
+
     @cached_property
     def snake_name(self) -> str:
-        return self.name_upper.lower()
+        underscore_name = self.name.replace('-', '_')
+
+        no_first_digits_name = ''.join(
+                dropwhile(
+                    lambda s: not str.isalpha(s), underscore_name))
+
+        return setting_name_replacement.get(
+            no_first_digits_name,
+            no_first_digits_name,
+        )
 
     @cached_property
     def datatypes_imports(self) -> list[str]: