continuing rework of generators
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good

This commit is contained in:
2023-02-09 15:14:21 +01:00
parent 8a88695409
commit 59689f2af6
4 changed files with 65 additions and 56 deletions

View File

@ -2,6 +2,7 @@
Event exporter.
"""
import datetime
import logging
import time
import os
from pathlib import Path
@ -16,10 +17,9 @@ from fsfwgen.events.event_parser import (
from fsfwgen.parserbase.file_list_parser import FileListParser
from fsfwgen.utility.printer import PrettyPrinter
from fsfwgen.utility.file_management import copy_file
from fsfwgen.logging import get_console_logger
from definitions import BspType, ROOT_DIR, OBSW_ROOT_DIR
LOGGER = get_console_logger()
_LOGGER = logging.getLogger(__name__)
DATE_TODAY = datetime.datetime.now()
DATE_STRING_FULL = DATE_TODAY.strftime("%Y-%m-%d %H:%M:%S")
@ -88,14 +88,11 @@ class BspConfig:
return [Path(x) for x in self.header_defs_destinations]
LOGGER = get_console_logger()
def parse_events(
bsp_type: BspType, generate_csv: bool = True, generate_cpp: bool = True
):
bsp_cfg = BspConfig(bsp_type)
LOGGER.info("EventParser: Parsing events: ")
_LOGGER.info("EventParser: Parsing events: ")
# Small delay for clean printout
time.sleep(0.01)
event_list = generate_event_list(bsp_cfg)
@ -109,7 +106,7 @@ def parse_events(
event_list=event_list,
file_separator=FILE_SEPARATOR,
)
LOGGER.info(f"Copying CSV file to {bsp_cfg.cpp_copy_dest}")
_LOGGER.info(f"Copying CSV file to {bsp_cfg.cpp_copy_dest}")
copy_file(
filename=bsp_cfg.csv_filename,
destination=bsp_cfg.csv_copy_dest,
@ -125,7 +122,7 @@ def parse_events(
header_file_name=CPP_H_FILENAME,
)
if COPY_CPP_FILE:
LOGGER.info(
_LOGGER.info(
f"EventParser: Copying CPP translation file to {bsp_cfg.cpp_copy_dest}"
)
copy_file(CPP_FILENAME, bsp_cfg.cpp_copy_dest)
@ -135,7 +132,7 @@ def parse_events(
def generate_event_list(cfg: BspConfig) -> EventDictT:
subsystem_parser = SubsystemDefinitionParser(cfg.subsystem_defs_as_paths())
subsystem_table = subsystem_parser.parse_files()
LOGGER.info(f"Found {len(subsystem_table)} subsystem definitions.")
_LOGGER.info(f"Found {len(subsystem_table)} subsystem definitions.")
PrettyPrinter.pprint(subsystem_table)
event_header_parser = FileListParser(cfg.header_defs_as_paths())
event_headers = event_header_parser.parse_header_files(
@ -148,5 +145,5 @@ def generate_event_list(cfg: BspConfig) -> EventDictT:
event_parser.set_moving_window_mode(moving_window_size=7)
event_table = event_parser.parse_files()
events_sorted = dict(sorted(event_table.items()))
LOGGER.info(f"Found {len(events_sorted)} entries")
_LOGGER.info(f"Found {len(events_sorted)} entries")
return events_sorted