IMPROVEMENT: Refractor for increased readability

Author: amilcarlucas

MethodicConfigurator/backend_filesystem.py

@@ -18,7 +18,6 @@
 from shutil import copytree as shutil_copytree
 
 from re import compile as re_compile
-from re import match as re_match
 
 # from sys import exit as sys_exit
 from logging import debug as logging_debug
@@ -110,17 +109,8 @@ def re_init(self, vehicle_dir: str, vehicle_type: str):
 
         self.load_vehicle_components_json_data(vehicle_dir)
 
-        if self.vehicle_components and 'Components' in self.vehicle_components:
-            components = self.vehicle_components['Components']
-        else:
-            components = None
-        if self.fw_version is None and components:
-            version_str = components.get('Flight Controller', {}).get('Firmware', {}).get('Version', '')
-            version_str = version_str.lstrip().split(' ')[0] if version_str else ''
-            if re_match(r'^\d+\.\d+\.\d+$', version_str):
-                self.fw_version = version_str
-            else:
-                logging_error(f"FW version string {version_str} on {self.vehicle_components_json_filename} is invalid")
+        if self.fw_version is None:
+            self.fw_version = self.get_fc_fw_version_from_vehicle_components_json()
 
         # Read ArduPilot parameter documentation
         xml_dir = vehicle_dir if os_path.isdir(vehicle_dir) else os_path.dirname(os_path.realpath(vehicle_dir))

MethodicConfigurator/backend_filesystem_vehicle_components.py

@@ -16,6 +16,8 @@
 from logging import warning as logging_warning
 from logging import error as logging_error
 
+from re import match as re_match
+
 from json import load as json_load
 from json import dump as json_dump
 from json import JSONDecodeError
@@ -52,3 +54,17 @@ def save_vehicle_components_json_data(self, data, vehicle_dir: str) -> bool:
             logging_error("Error saving JSON data to file '%s': %s", filepath, e)
             return True
         return False
+
+    def get_fc_fw_version_from_vehicle_components_json(self) -> str:
+        if self.vehicle_components and 'Components' in self.vehicle_components:
+            components = self.vehicle_components['Components']
+        else:
+            components = None
+        if components:
+            version_str = components.get('Flight Controller', {}).get('Firmware', {}).get('Version', '')
+            version_str = version_str.lstrip().split(' ')[0] if version_str else ''
+            if re_match(r'^\d+\.\d+\.\d+$', version_str):
+                return version_str
+            else:
+                logging_error(f"FW version string {version_str} on {self.vehicle_components_json_filename} is invalid")
+        return None