fsfwgen update

generators/returnvalues/returnvalues_parser.py

@@ -3,10 +3,16 @@
 """Part of the MIB export tools for the EIVE project by.
 Returnvalue exporter.
 """
+from pathlib import Path
+
 from fsfwgen.core import get_console_logger
 from fsfwgen.utility.file_management import copy_file
 from fsfwgen.parserbase.file_list_parser import FileListParser
-from fsfwgen.returnvalues.returnvalues_parser import InterfaceParser, ReturnValueParser
+from fsfwgen.returnvalues.returnvalues_parser import (
+    InterfaceParser,
+    ReturnValueParser,
+    RetvalDictT,
+)
 from fsfwgen.utility.sql_writer import SqlWriter
 from fsfwgen.utility.printer import PrettyPrinter
 
@@ -45,6 +51,7 @@ RETURNVALUE_SOURCES = [
     f"{OBSW_ROOT_DIR}/fsfw/",
     f"{BSP_PATH}",
 ]
+RETVAL_SRCS_AS_PATH = [Path(x) for x in RETURNVALUE_SOURCES]
 
 if ADD_LINUX_FOLDER:
     RETURNVALUE_SOURCES.append(f"{OBSW_ROOT_DIR}/linux")
@@ -95,7 +102,7 @@ def generate_returnvalue_table():
         file_list=INTERFACE_DEFINITION_FILES, print_table=PRINT_TABLES
     )
     interfaces = interface_parser.parse_files()
-    header_parser = FileListParser(RETURNVALUE_SOURCES)
+    header_parser = FileListParser(RETVAL_SRCS_AS_PATH)
     header_list = header_parser.parse_header_files(True, "Parsing header file list: ")
     returnvalue_parser = ReturnValueParser(interfaces, header_list, PRINT_TABLES)
     returnvalue_parser.obsw_root_path = OBSW_ROOT_DIR
@@ -105,13 +112,19 @@ def generate_returnvalue_table():
     return returnvalue_table
 
 
-def sql_retval_exporter(returnvalue_table, db_filename: str):
+def sql_retval_exporter(returnvalue_table: RetvalDictT, db_filename: str):
     sql_writer = SqlWriter(db_filename=db_filename)
     sql_writer.open(SQL_CREATE_RETURNVALUES_CMD)
     for entry in returnvalue_table.items():
         sql_writer.write_entries(
             SQL_INSERT_RETURNVALUES_CMD,
-            (entry[0], entry[1][2], entry[1][4], entry[1][3], entry[1][1]),
+            (
+                entry[0],
+                entry[1].name,
+                entry[1].description,
+                entry[1].unique_id,
+                entry[1].subsystem_name,
+            ),
         )
     sql_writer.commit()
     sql_writer.close()