Make code generator handle members where name cannot be converted back

igo95862 · igo95862 · commit ce18c8232fd2 · 2025-03-08T17:55:35.000Z
Certain member names like `GetURL` will be converted to Python name `get_url` but when converted back it will become `GetUrl`. This will cause methods and properties with those names be unaccessible. However, method, properties and signals allow setting the D-Bus name instead of relying on auto conversion. Make code generator use those arguments where auto conversion does not produce equal names between D-Bus and Python. Reported by @nicomuns.
diff --git a/src/sdbus/dbus_common_elements.py b/src/sdbus/dbus_common_elements.py
@@ -24,8 +24,8 @@
 
 from .dbus_common_funcs import (
     _is_property_flags_correct,
-    _method_name_converter,
     get_default_bus,
+    snake_case_to_camel_case,
 )
 from .sd_bus_internals import is_interface_name_valid, is_member_name_valid
 
@@ -122,8 +122,7 @@ def __init__(
             " it in to a tuple ('string', ) ?")
 
         if method_name is None:
-            method_name = ''.join(
-                _method_name_converter(original_method.__name__))
+            method_name = snake_case_to_camel_case(original_method.__name__)
 
         try:
             assert is_member_name_valid(method_name), (
@@ -230,8 +229,7 @@ def __init__(self,
                  flags: int,
                  original_method: FunctionType):
         if property_name is None:
-            property_name = ''.join(
-                _method_name_converter(original_method.__name__))
+            property_name = snake_case_to_camel_case(original_method.__name__)
 
         try:
             assert is_member_name_valid(property_name), (
@@ -262,8 +260,7 @@ def __init__(self,
                  flags: int,
                  original_method: FunctionType):
         if signal_name is None:
-            signal_name = ''.join(
-                _method_name_converter(original_method.__name__))
+            signal_name = snake_case_to_camel_case(original_method.__name__)
 
         try:
             assert is_member_name_valid(signal_name), (
diff --git a/src/sdbus/dbus_common_funcs.py b/src/sdbus/dbus_common_funcs.py
@@ -135,8 +135,8 @@ def request_default_bus_name(
     return _DeprecationAwaitable()
 
 
-def _method_name_converter(python_name: str) -> Iterator[str]:
-    char_iter = iter(python_name)
+def _snake_case_to_camel_case_gen(snake: str) -> Iterator[str]:
+    char_iter = iter(snake)
     # Name starting with upper case letter
     try:
         first_char = next(char_iter)
@@ -158,6 +158,10 @@ def _method_name_converter(python_name: str) -> Iterator[str]:
             upper_next_one = True
 
 
+def snake_case_to_camel_case(snake: str) -> str:
+    return "".join(_snake_case_to_camel_case_gen(snake))
+
+
 def _check_sync_in_async_env() -> bool:
     try:
         get_running_loop()
diff --git a/src/sdbus/interface_generator.py b/src/sdbus/interface_generator.py
@@ -24,6 +24,8 @@
 from xml.etree.ElementTree import fromstring as etree_from_str
 from xml.etree.ElementTree import parse as etree_from_file
 
+from .dbus_common_funcs import snake_case_to_camel_case
+
 if TYPE_CHECKING:
     from collections.abc import Iterable, Iterator
     from typing import Literal, Optional, Union
@@ -317,6 +319,10 @@ def iter_sub_elements(self, element: Element) -> None:
                 raise ValueError(
                     'Uknown member annotation tag: ', tag)
 
+    @property
+    def wants_rename(self) -> bool:
+        return self.method_name != snake_case_to_camel_case(self.python_name)
+
 
 class DbusArgsIntrospection:
     def __init__(self, element: Element):
@@ -591,6 +597,9 @@ def has_members(self) -> bool:
 {% if method.flags_str %}
 flags={{ method.flags_str }},
 {% endif %}
+{% if method.wants_rename %}
+method_name="{{method.method_name}}",
+{% endif %}
 """
     ),
     "generic_property_flags": (
@@ -601,6 +610,9 @@ def has_members(self) -> bool:
 {% if a_property.flags_str %}
 flags={{ a_property.flags_str }},
 {% endif %}
+{% if a_property.wants_rename %}
+property_name="{{a_property.method_name}}",
+{% endif %}
 """
     ),
     "generic_header": """\
@@ -709,6 +721,9 @@ def {{ a_property.python_name }}(self) -> {{ a_property.typing }}:
 {% if signal.flags_str %}
     flags={{ signal.flags_str }},
 {% endif %}
+{% if signal.wants_rename %}
+    signal_name=signal.method_name,
+{% endif %}
 )
 def {{ signal.python_name }}(self) -> {{ signal.typing }}:
     raise NotImplementedError
