Update ardupilot_methodic_configurator/extract_param_defaults.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Amilcar Lucas <amilcar.lucas@iav.de>

Author: amilcarlucas

ardupilot_methodic_configurator/extract_param_defaults.py

@@ -196,33 +196,39 @@ def extract_firmware_version_and_vehicle_type(logfile: str) -> tuple[str, int, i
         msg = f"Error opening the {logfile} logfile: {e!s}"
         raise SystemExit(msg) from e
 
-    msg_fallback_result: Union[tuple[str, int, int, int], None] = None
-    while True:
-        m = mlog.recv_match(type=["VER", "MSG"])
-        if m is None:
-            break
-        if m.get_type() == "VER":
-            fws = str(m.FWS)  # e.g. "ArduCopter V4.6.3 (3fc7011a)"
-            vehicle_type = fws.split(maxsplit=1)[0] if fws else ""
-            maj, min_, pat = m.Maj, m.Min, m.Pat
-            if maj is None or min_ is None or pat is None:
-                continue
-            return vehicle_type, int(maj), int(min_), int(pat)
-        # Parse each MSG; store the first parseable Vx.y one as fallback and keep scanning for VER
-        if msg_fallback_result is None:
-            parts = str(m.Message).split()
-            if len(parts) >= 2 and parts[1].startswith("V"):
-                version_parts = parts[1][1:].split(".")  # Remove "V" prefix, split by "."
-                if len(version_parts) >= 2:
-                    with contextlib.suppress(ValueError):
-                        patch_val = int(version_parts[2]) if len(version_parts) >= 3 else 0
-                        msg_fallback_result = (parts[0], int(version_parts[0]), int(version_parts[1]), patch_val)
-
-    if msg_fallback_result is not None:
-        return msg_fallback_result
-
-    msg = f"No firmware version information found in {logfile}"
-    raise SystemExit(msg)
+    try:
+        msg_fallback_result: Union[tuple[str, int, int, int], None] = None
+        while True:
+            m = mlog.recv_match(type=["VER", "MSG"])
+            if m is None:
+                break
+            if m.get_type() == "VER":
+                fws = str(m.FWS)  # e.g. "ArduCopter V4.6.3 (3fc7011a)"
+                vehicle_type = fws.split(maxsplit=1)[0] if fws else ""
+                maj, min_, pat = m.Maj, m.Min, m.Pat
+                if maj is None or min_ is None or pat is None:
+                    continue
+                return vehicle_type, int(maj), int(min_), int(pat)
+            # Parse each MSG; store the first parseable Vx.y one as fallback and keep scanning for VER
+            if msg_fallback_result is None:
+                parts = str(m.Message).split()
+                if len(parts) >= 2 and parts[1].startswith("V"):
+                    version_parts = parts[1][1:].split(".")  # Remove "V" prefix, split by "."
+                    if len(version_parts) >= 2:
+                        with contextlib.suppress(ValueError):
+                            patch_val = int(version_parts[2]) if len(version_parts) >= 3 else 0
+                            msg_fallback_result = (parts[0], int(version_parts[0]), int(version_parts[1]), patch_val)
+
+        if msg_fallback_result is not None:
+            return msg_fallback_result
+
+        msg = f"No firmware version information found in {logfile}"
+        raise SystemExit(msg)
+    finally:
+        close_method = getattr(mlog, "close", None)
+        if callable(close_method):
+            with contextlib.suppress(Exception):
+                close_method()
 
 
 def missionplanner_sort(item: str) -> tuple[str, ...]: