detect types in _parse_additonal_config

Author: zariiii9003

can/logger.py

@@ -13,12 +13,12 @@
 
 Dynamic Controls 2010
 """
-
+import re
 import sys
 import argparse
 from datetime import datetime
 import errno
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Union, Sequence, Tuple
 
 import can
 from . import Bus, BusState, Logger, SizedRotatingLogger
@@ -132,11 +132,28 @@ def _parse_filters(parsed_args: Any) -> CanFilters:
     return can_filters
 
 
-def _parse_additonal_config(unknown_args):
-    return dict(
-        (arg.split("=", 1)[0].lstrip("--").replace("-", "_"), arg.split("=", 1)[1])
-        for arg in unknown_args
-    )
+def _parse_additonal_config(
+    unknown_args: Sequence[str],
+) -> Dict[str, Union[str, int, float, bool]]:
+    def _split_arg(_arg: str) -> Tuple[str, str]:
+        left, right = _arg.split("=", 1)
+        return left.lstrip("--").replace("-", "_"), right
+
+    args: Dict[str, Union[str, int, float, bool]] = {}
+    for key, string_val in map(_split_arg, unknown_args):
+        if re.match(r"^[-+]?\d+$", string_val):
+            # value is integer
+            args[key] = int(string_val)
+        elif re.match(r"^[-+]?\d*\.\d+$", string_val):
+            # value is float
+            args[key] = float(string_val)
+        elif re.match(r"^(?:True|False)$", string_val):
+            # value is bool
+            args[key] = string_val == "True"
+        else:
+            # value is string
+            args[key] = string_val
+    return args
 
 
 def main() -> None:

test/test_logger.py

@@ -105,6 +105,30 @@ def test_log_virtual_sizedlogger(self):
         self.assertSuccessfullCleanup()
         self.mock_logger_sized.assert_called_once()
 
+    def test_parse_additonal_config(self):
+        unknown_args = [
+            "--app-name=CANalyzer",
+            "--serial=5555",
+            "--receive-own-messages=True",
+            "--offset=1.5",
+        ]
+        parsed_args = can.logger._parse_additonal_config(unknown_args)
+
+        assert "app_name" in parsed_args
+        assert parsed_args["app_name"] == "CANalyzer"
+
+        assert "serial" in parsed_args
+        assert parsed_args["serial"] == 5555
+
+        assert "receive_own_messages" in parsed_args
+        assert (
+            isinstance(parsed_args["receive_own_messages"], bool)
+            and parsed_args["receive_own_messages"] is True
+        )
+
+        assert "offset" in parsed_args
+        assert parsed_args["offset"] == 1.5
+
 
 class TestLoggerCompressedFile(unittest.TestCase):
     def setUp(self) -> None: