armodel 1.8.7__py3-none-any.whl → 1.9.1__py3-none-any.whl

armodel/parser/connector_xlsx_parser.py

@@ -1,194 +1,193 @@
-from typing import Dict, List
-from openpyxl import Workbook
-from openpyxl.worksheet.worksheet import Worksheet
-
-import openpyxl
-import re
-
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
-
-from ..parser.excel_parser import AbstractExcelParser
-from ..data_models.sw_connector import AssemblySwConnectorData, DelegationSwConnectorData, SwConnectorData
-from ..models.ar_ref import PPortInCompositionInstanceRef, RPortInCompositionInstanceRef
-from ..models.sw_component import CompositionSwComponentType
-from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
-
-class ConnectorXls:
-
-    COL_SHORT_NAME      = 'Short Name'
-    COL_INNER_SW_C      = 'Inner SW-C'
-    COL_INNER_PPORT     = 'Inner PPort'
-    COL_OUTER_PPORT     = 'Outer PPort'
-    COL_INNER_RPORT     = 'Inner RPort'
-    COL_OUTER_RPORT     = 'Outer RPort'
-
-    COL_PROVIDER_SW_C    = "Provide SW-C"
-    COL_PPORT           = "PPort"
-    COL_REQUESTER_SW_C    = "Request SW-C"
-    COL_RPORT           = "RPort"
-
-class ConnectorXlsReader(AbstractExcelParser):
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.column_delegation_sw_connectors = {
-            ConnectorXls.COL_SHORT_NAME: -1,
-            ConnectorXls.COL_INNER_SW_C: -1,
-            ConnectorXls.COL_INNER_PPORT: -1,
-            ConnectorXls.COL_OUTER_PPORT: -1,
-            ConnectorXls.COL_INNER_RPORT: -1,
-            ConnectorXls.COL_OUTER_RPORT: -1,
-        }
-
-        self.column_assembly_sw_connectors = {
-            ConnectorXls.COL_SHORT_NAME: -1,
-            ConnectorXls.COL_PROVIDER_SW_C: -1,
-            ConnectorXls.COL_PPORT: -1,
-            ConnectorXls.COL_REQUESTER_SW_C: -1,
-            ConnectorXls.COL_RPORT: -1,
-        }
-
-        self.sw_connectors = {}    # type: Dict[str, List[DelegationSwConnectorData]]
-        
-
-    def getCompositionSwComponentList(self) -> List[str]:
-        return self.sw_connectors.keys()
-            
-    def getSwConnectorList(self, swc: str) -> List[SwConnectorData]:
-        if swc not in self.sw_connectors:
-            self.sw_connectors[swc] = []
-        return self.sw_connectors[swc]
-        #return sorted(self.sw_connectors[swc], key = lambda o: o.short_name)
-            
-    def readDelegationSwConnectors(self, sheet: Worksheet, swc: str, start_row: int, column_list: Dict[str, int]):
-        connectors = self.getSwConnectorList(swc)
-        for row in sheet.iter_rows(min_row = start_row, values_only= True):
-            connector = DelegationSwConnectorData()
-            connector.short_name = row[column_list[ConnectorXls.COL_SHORT_NAME]]
-            connector.inner_swc = row[column_list[ConnectorXls.COL_INNER_SW_C]]
-            connector.inner_pport = row[column_list[ConnectorXls.COL_INNER_PPORT]]
-            connector.inner_rport = row[column_list[ConnectorXls.COL_INNER_RPORT]]
-            connector.outer_pport = row[column_list[ConnectorXls.COL_OUTER_PPORT]]
-            connector.outer_rport = row[column_list[ConnectorXls.COL_OUTER_RPORT]]
-            connectors.append(connector)
-            self._logger.debug("ShortName: %s" % connector.short_name)
-
-    def readAssemblySwConnectors(self, sheet: Worksheet, swc: str, start_row: int, column_list: Dict[str, int]):
-        connectors = self.getSwConnectorList(swc)
-        for row in sheet.iter_rows(min_row = start_row, values_only= True):
-            connector = AssemblySwConnectorData()
-            connector.short_name = row[column_list[ConnectorXls.COL_SHORT_NAME]]
-            connector.provider_swc = row[column_list[ConnectorXls.COL_PROVIDER_SW_C]]
-            connector.pport = row[column_list[ConnectorXls.COL_PPORT]]
-            connector.requester_swc = row[column_list[ConnectorXls.COL_REQUESTER_SW_C]]
-            connector.rport = row[column_list[ConnectorXls.COL_RPORT]]
-            connectors.append(connector)
-            self._logger.debug("ShortName: %s" % connector.short_name)
-
-    def parseDelegationSWConnectors(self, sheet: Worksheet, swc: str):
-        self._logger.debug("Parse all DelegationSwConnector of %s" % swc)
-
-        self.getColumnTitles(sheet, 1, self.column_delegation_sw_connectors)
-        self.checkColumnTitles(self.column_delegation_sw_connectors, "Invalid DelegationSwConnectors Excel and column <%s> cannot be located.")
-        self.readDelegationSwConnectors(sheet, swc, 2, self.column_delegation_sw_connectors)
-
-    def parseAssemblySWConnectors(self, sheet: Worksheet, swc: str):
-        self._logger.debug("Parse all AssemblySwConnector of %s" % swc)
-
-        self.getColumnTitles(sheet, 1, self.column_assembly_sw_connectors)
-        self.checkColumnTitles(self.column_assembly_sw_connectors, "Invalid AssemblySwConnectors Excel and column <%s> cannot be located.")
-        self.readAssemblySwConnectors(sheet, swc, 2, self.column_assembly_sw_connectors)
-        
-    def read(self, excel_file: str):
-        self._logger.info("Parse excel file <%s>" % excel_file) 
-
-        wb = openpyxl.load_workbook(excel_file, data_only=True)
-
-        for name in wb.sheetnames:
-            m = re.match(r'(\w+)\s+-\s+(AC|DC)', name)
-            if m:
-                if m.group(2) == "DC":
-                    self.parseDelegationSWConnectors(wb[name], m.group(1))
-                elif m.group(2) == "AC":
-                    self.parseAssemblySWConnectors(wb[name], m.group(1))
-                else:
-                    raise ValueError("Invalid sheet")
-                
-    def _addAssemblySwConnector(self, swc: CompositionSwComponentType, connector: AssemblySwConnectorData):
-        sw_connector = swc.createAssemblySwConnector(connector.short_name)
-
-        sw_connector.provider_iref = PPortInCompositionInstanceRef()
-        sw_connector.provider_iref.context_component_ref = RefType()
-        sw_connector.provider_iref.target_p_port_ref = RefType()
-        sw_connector.provider_iref.context_component_ref.dest = "SW-COMPONENT-PROTOTYPE"
-        sw_connector.provider_iref.context_component_ref.value = connector.provider_swc
-        sw_connector.provider_iref.target_p_port_ref.dest = "P-PORT-PROTOTYPE"
-        sw_connector.provider_iref.target_p_port_ref.value = connector.pport
-
-        sw_connector.requester_iref = RPortInCompositionInstanceRef()
-        sw_connector.requester_iref.context_component_ref = RefType()
-        sw_connector.requester_iref.target_r_port_ref = RefType()
-        sw_connector.requester_iref.context_component_ref.dest = "SW-COMPONENT-PROTOTYPE"
-        sw_connector.requester_iref.context_component_ref.value = connector.requester_swc
-        sw_connector.requester_iref.target_r_port_ref.dest = "R-PORT-PROTOTYPE"
-        sw_connector.requester_iref.target_r_port_ref.value = connector.rport
-
-    def _addDelegationSwConnector(self, swc: CompositionSwComponentType, connector: DelegationSwConnectorData):
-        sw_connector = swc.createDelegationSwConnector(connector.short_name)
-        if connector.inner_pport is not None and connector.outer_pport is not None:
-            sw_connector.inner_port_iref = PPortInCompositionInstanceRef()
-            sw_connector.inner_port_iref.context_component_ref = RefType()
-            sw_connector.inner_port_iref.target_p_port_ref = RefType()
-            sw_connector.outer_port_ref = RefType()
-            sw_connector.inner_port_iref.context_component_ref.dest = "SW-COMPONENT-PROTOTYPE"
-            sw_connector.inner_port_iref.context_component_ref.value = connector.inner_swc
-            sw_connector.inner_port_iref.target_p_port_ref.dest = "P-PORT-PROTOTYPE"
-            sw_connector.inner_port_iref.target_p_port_ref.value = connector.inner_pport
-            sw_connector.outer_port_ref.dest = "P-PORT-PROTOTYPE"
-            sw_connector.outer_port_ref.value = connector.outer_pport
-        elif connector.inner_rport is not None and connector.outer_rport is not None:
-            sw_connector.inner_port_iref = RPortInCompositionInstanceRef()
-            sw_connector.inner_port_iref.context_component_ref = RefType()
-            sw_connector.inner_port_iref.target_r_port_ref = RefType()
-            sw_connector.outer_port_ref = RefType()
-            sw_connector.inner_port_iref.context_component_ref.dest = "SW-COMPONENT-PROTOTYPE"
-            sw_connector.inner_port_iref.context_component_ref.value = connector.inner_swc
-            sw_connector.inner_port_iref.target_r_port_ref.dest = "R-PORT-PROTOTYPE"
-            sw_connector.inner_port_iref.target_r_port_ref.value = connector.inner_rport
-            sw_connector.outer_port_ref.dest = "R-PORT-PROTOTYPE"
-            sw_connector.outer_port_ref.value = connector.outer_rport
-        else:
-            raise ValueError("Invalid DelegationSwConnector Configuration")
-
-                
-    def _updateCompositionSwComponent(self, swc: CompositionSwComponentType):
-        # remove all the sw connector first
-        swc.removeAllAssemblySwConnector()
-        swc.removeAllDelegationSwConnector()
-
-        connectors = self.getSwConnectorList(swc.short_name)
-
-        for connector in connectors:
-            #self._logger.info("Update %s" % connector.short_name)
-            if isinstance(connector, AssemblySwConnectorData):
-                self._addAssemblySwConnector(swc, connector)
-            elif isinstance(connector, DelegationSwConnectorData):
-                self._addDelegationSwConnector(swc, connector)
-            else:
-                raise ValueError("Invalid connector information")
-                
-    def _locateCompositionSwComponent(self, swc_name: str, parent: ARPackage):
-        for swc in parent.getSwComponentTypes():
-            if swc.short_name == swc_name:
-                self._updateCompositionSwComponent(swc)
-        for pkg in parent.getARPackages():
-            self._locateCompositionSwComponent(swc_name, pkg)
-
-    def update(self, document: AUTOSAR):
-        for name in self.getCompositionSwComponentList():
-            for pkg in document.getARPackages():
-                self._locateCompositionSwComponent(name, pkg)
-
+from typing import Dict, List
+from openpyxl.worksheet.worksheet import Worksheet
+
+import openpyxl
+import re
+
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
+
+from armodel.parser.excel_parser import AbstractExcelParser
+from armodel.data_models.sw_connector import AssemblySwConnectorData, DelegationSwConnectorData, SwConnectorData
+from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import PPortInCompositionInstanceRef, RPortInCompositionInstanceRef
+from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import CompositionSwComponentType
+from armodel.models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
+
+class ConnectorXls:
+
+    COL_SHORT_NAME      = 'Short Name'
+    COL_INNER_SW_C      = 'Inner SW-C'
+    COL_INNER_PPORT     = 'Inner PPort'
+    COL_OUTER_PPORT     = 'Outer PPort'
+    COL_INNER_RPORT     = 'Inner RPort'
+    COL_OUTER_RPORT     = 'Outer RPort'
+
+    COL_PROVIDER_SW_C    = "Provide SW-C"
+    COL_PPORT           = "PPort"
+    COL_REQUESTER_SW_C    = "Request SW-C"
+    COL_RPORT           = "RPort"
+
+class ConnectorXlsReader(AbstractExcelParser):
+    def __init__(self) -> None:
+        super().__init__()
+
+        self.column_delegation_sw_connectors = {
+            ConnectorXls.COL_SHORT_NAME: -1,
+            ConnectorXls.COL_INNER_SW_C: -1,
+            ConnectorXls.COL_INNER_PPORT: -1,
+            ConnectorXls.COL_OUTER_PPORT: -1,
+            ConnectorXls.COL_INNER_RPORT: -1,
+            ConnectorXls.COL_OUTER_RPORT: -1,
+        }
+
+        self.column_assembly_sw_connectors = {
+            ConnectorXls.COL_SHORT_NAME: -1,
+            ConnectorXls.COL_PROVIDER_SW_C: -1,
+            ConnectorXls.COL_PPORT: -1,
+            ConnectorXls.COL_REQUESTER_SW_C: -1,
+            ConnectorXls.COL_RPORT: -1,
+        }
+
+        self.sw_connectors = {}    # type: Dict[str, List[DelegationSwConnectorData]]
+        
+
+    def getCompositionSwComponentList(self) -> List[str]:
+        return self.sw_connectors.keys()
+            
+    def getSwConnectorList(self, swc: str) -> List[SwConnectorData]:
+        if swc not in self.sw_connectors:
+            self.sw_connectors[swc] = []
+        return self.sw_connectors[swc]
+        #return sorted(self.sw_connectors[swc], key = lambda o: o.short_name)
+            
+    def readDelegationSwConnectors(self, sheet: Worksheet, swc: str, start_row: int, column_list: Dict[str, int]):
+        connectors = self.getSwConnectorList(swc)
+        for row in sheet.iter_rows(min_row = start_row, values_only= True):
+            connector = DelegationSwConnectorData()
+            connector.short_name = row[column_list[ConnectorXls.COL_SHORT_NAME]]
+            connector.inner_swc = row[column_list[ConnectorXls.COL_INNER_SW_C]]
+            connector.inner_pport = row[column_list[ConnectorXls.COL_INNER_PPORT]]
+            connector.inner_rport = row[column_list[ConnectorXls.COL_INNER_RPORT]]
+            connector.outer_pport = row[column_list[ConnectorXls.COL_OUTER_PPORT]]
+            connector.outer_rport = row[column_list[ConnectorXls.COL_OUTER_RPORT]]
+            connectors.append(connector)
+            self._logger.debug("ShortName: %s" % connector.short_name)
+
+    def readAssemblySwConnectors(self, sheet: Worksheet, swc: str, start_row: int, column_list: Dict[str, int]):
+        connectors = self.getSwConnectorList(swc)
+        for row in sheet.iter_rows(min_row = start_row, values_only= True):
+            connector = AssemblySwConnectorData()
+            connector.short_name = row[column_list[ConnectorXls.COL_SHORT_NAME]]
+            connector.provider_swc = row[column_list[ConnectorXls.COL_PROVIDER_SW_C]]
+            connector.pport = row[column_list[ConnectorXls.COL_PPORT]]
+            connector.requester_swc = row[column_list[ConnectorXls.COL_REQUESTER_SW_C]]
+            connector.rport = row[column_list[ConnectorXls.COL_RPORT]]
+            connectors.append(connector)
+            self._logger.debug("ShortName: %s" % connector.short_name)
+
+    def parseDelegationSWConnectors(self, sheet: Worksheet, swc: str):
+        self._logger.debug("Parse all DelegationSwConnector of %s" % swc)
+
+        self.getColumnTitles(sheet, 1, self.column_delegation_sw_connectors)
+        self.checkColumnTitles(self.column_delegation_sw_connectors, "Invalid DelegationSwConnectors Excel and column <%s> cannot be located.")
+        self.readDelegationSwConnectors(sheet, swc, 2, self.column_delegation_sw_connectors)
+
+    def parseAssemblySWConnectors(self, sheet: Worksheet, swc: str):
+        self._logger.debug("Parse all AssemblySwConnector of %s" % swc)
+
+        self.getColumnTitles(sheet, 1, self.column_assembly_sw_connectors)
+        self.checkColumnTitles(self.column_assembly_sw_connectors, "Invalid AssemblySwConnectors Excel and column <%s> cannot be located.")
+        self.readAssemblySwConnectors(sheet, swc, 2, self.column_assembly_sw_connectors)
+        
+    def read(self, excel_file: str):
+        self._logger.info("Parse excel file <%s>" % excel_file) 
+
+        wb = openpyxl.load_workbook(excel_file, data_only=True)
+
+        for name in wb.sheetnames:
+            m = re.match(r'(\w+)\s+-\s+(AC|DC)', name)
+            if m:
+                if m.group(2) == "DC":
+                    self.parseDelegationSWConnectors(wb[name], m.group(1))
+                elif m.group(2) == "AC":
+                    self.parseAssemblySWConnectors(wb[name], m.group(1))
+                else:
+                    raise ValueError("Invalid sheet")
+                
+    def _addAssemblySwConnector(self, swc: CompositionSwComponentType, connector: AssemblySwConnectorData):
+        sw_connector = swc.createAssemblySwConnector(connector.short_name)
+
+        sw_connector.provider_iref = PPortInCompositionInstanceRef()
+        sw_connector.provider_iref.context_component_ref = RefType()
+        sw_connector.provider_iref.target_p_port_ref = RefType()
+        sw_connector.provider_iref.context_component_ref.dest = "SW-COMPONENT-PROTOTYPE"
+        sw_connector.provider_iref.context_component_ref.value = connector.provider_swc
+        sw_connector.provider_iref.target_p_port_ref.dest = "P-PORT-PROTOTYPE"
+        sw_connector.provider_iref.target_p_port_ref.value = connector.pport
+
+        sw_connector.requester_iref = RPortInCompositionInstanceRef()
+        sw_connector.requester_iref.context_component_ref = RefType()
+        sw_connector.requester_iref.target_r_port_ref = RefType()
+        sw_connector.requester_iref.context_component_ref.dest = "SW-COMPONENT-PROTOTYPE"
+        sw_connector.requester_iref.context_component_ref.value = connector.requester_swc
+        sw_connector.requester_iref.target_r_port_ref.dest = "R-PORT-PROTOTYPE"
+        sw_connector.requester_iref.target_r_port_ref.value = connector.rport
+
+    def _addDelegationSwConnector(self, swc: CompositionSwComponentType, connector: DelegationSwConnectorData):
+        sw_connector = swc.createDelegationSwConnector(connector.short_name)
+        if connector.inner_pport is not None and connector.outer_pport is not None:
+            sw_connector.inner_port_iref = PPortInCompositionInstanceRef()
+            sw_connector.inner_port_iref.context_component_ref = RefType()
+            sw_connector.inner_port_iref.target_p_port_ref = RefType()
+            sw_connector.outer_port_ref = RefType()
+            sw_connector.inner_port_iref.context_component_ref.dest = "SW-COMPONENT-PROTOTYPE"
+            sw_connector.inner_port_iref.context_component_ref.value = connector.inner_swc
+            sw_connector.inner_port_iref.target_p_port_ref.dest = "P-PORT-PROTOTYPE"
+            sw_connector.inner_port_iref.target_p_port_ref.value = connector.inner_pport
+            sw_connector.outer_port_ref.dest = "P-PORT-PROTOTYPE"
+            sw_connector.outer_port_ref.value = connector.outer_pport
+        elif connector.inner_rport is not None and connector.outer_rport is not None:
+            sw_connector.inner_port_iref = RPortInCompositionInstanceRef()
+            sw_connector.inner_port_iref.context_component_ref = RefType()
+            sw_connector.inner_port_iref.target_r_port_ref = RefType()
+            sw_connector.outer_port_ref = RefType()
+            sw_connector.inner_port_iref.context_component_ref.dest = "SW-COMPONENT-PROTOTYPE"
+            sw_connector.inner_port_iref.context_component_ref.value = connector.inner_swc
+            sw_connector.inner_port_iref.target_r_port_ref.dest = "R-PORT-PROTOTYPE"
+            sw_connector.inner_port_iref.target_r_port_ref.value = connector.inner_rport
+            sw_connector.outer_port_ref.dest = "R-PORT-PROTOTYPE"
+            sw_connector.outer_port_ref.value = connector.outer_rport
+        else:
+            raise ValueError("Invalid DelegationSwConnector Configuration")
+
+                
+    def _updateCompositionSwComponent(self, swc: CompositionSwComponentType):
+        # remove all the sw connector first
+        swc.removeAllAssemblySwConnector()
+        swc.removeAllDelegationSwConnector()
+
+        connectors = self.getSwConnectorList(swc.short_name)
+
+        for connector in connectors:
+            #self._logger.info("Update %s" % connector.short_name)
+            if isinstance(connector, AssemblySwConnectorData):
+                self._addAssemblySwConnector(swc, connector)
+            elif isinstance(connector, DelegationSwConnectorData):
+                self._addDelegationSwConnector(swc, connector)
+            else:
+                raise ValueError("Invalid connector information")
+                
+    def _locateCompositionSwComponent(self, swc_name: str, parent: ARPackage):
+        for swc in parent.getSwComponentTypes():
+            if swc.short_name == swc_name:
+                self._updateCompositionSwComponent(swc)
+        for pkg in parent.getARPackages():
+            self._locateCompositionSwComponent(swc_name, pkg)
+
+    def update(self, document: AUTOSAR):
+        for name in self.getCompositionSwComponentList():
+            for pkg in document.getARPackages():
+                self._locateCompositionSwComponent(name, pkg)
+
     

armodel/parser/excel_parser.py

@@ -1,18 +1,18 @@
-from typing import Dict
-from openpyxl.worksheet.worksheet import Worksheet
-
-import logging
-class AbstractExcelParser:
-    def __init__(self) -> None:
-        self._logger = logging.getLogger()
-
-    def getColumnTitles(self, sheet: Worksheet, title_row:int, column_list: Dict[str, int]):
-        for column in range(1, sheet.max_column + 1):
-            value = sheet.cell(title_row, column).value
-            if value in column_list:
-                column_list[value] = column - 1
-
-    def checkColumnTitles(self, column_list: Dict[str, int], message: str):
-        for key, value in column_list.items():
-            if value == -1:
+from typing import Dict
+from openpyxl.worksheet.worksheet import Worksheet
+
+import logging
+class AbstractExcelParser:
+    def __init__(self) -> None:
+        self._logger = logging.getLogger()
+
+    def getColumnTitles(self, sheet: Worksheet, title_row:int, column_list: Dict[str, int]):
+        for column in range(1, sheet.max_column + 1):
+            value = sheet.cell(title_row, column).value
+            if value in column_list:
+                column_list[value] = column - 1
+
+    def checkColumnTitles(self, column_list: Dict[str, int], message: str):
+        for key, value in column_list.items():
+            if value == -1:
                 raise ValueError(message % key)

armodel/parser/file_parser.py

@@ -1,46 +1,46 @@
-import logging
-import os
-import re
-from typing import List
-
-from colorama import Fore
-
-
-class FileListParser:
-    '''
-        FileListParser supports to collect the arxml files from the following rules
-         
-    '''
-    def __init__(self) -> None:
-        self.file_list = []
-        self.logger = logging.getLogger()
-
-    def get_file_list(self) -> List[str]:
-        return self.file_list
-    
-    def parse_text_file(self, file):
-        try:
-            with open(file) as f_in:
-                for line in f_in:
-                    if not line.startswith('#'):
-                        self.file_list.append(line.strip())
-        except IOError:
-            self.logger.error(Fore.RED + "No such file or directory: %s" % os.path.realpath(file) + Fore.WHITE)
-
-    def parse_dir_files(self, dir_name):
-        for (root, _, files) in os.walk(dir_name, topdown=False):
-            for file in files:
-                m = re.match(r'.*\.arxml$', file, re.I)
-                if m:
-                    self.file_list.append(os.path.join(root, file))
-
-    def parse(self, args: List[str]):
-        for input_file in args:
-            if os.path.isdir(input_file):
-                self.parse_dir_files(input_file)
-            else:
-                if input_file[0] == "@":
-                    logging.debug("Parse ARXML list file %s " % input_file)
-                    self.parse_text_file(input_file[1:])
-                else:
-                    self.file_list.append(input_file)
+import logging
+import os
+import re
+from typing import List
+
+from colorama import Fore
+
+
+class FileListParser:
+    '''
+        FileListParser supports to collect the arxml files from the following rules
+         
+    '''
+    def __init__(self) -> None:
+        self.file_list = []
+        self.logger = logging.getLogger()
+
+    def get_file_list(self) -> List[str]:
+        return self.file_list
+    
+    def parse_text_file(self, file):
+        try:
+            with open(file) as f_in:
+                for line in f_in:
+                    if not line.startswith('#'):
+                        self.file_list.append(line.strip())
+        except IOError:
+            self.logger.error(Fore.RED + "No such file or directory: %s" % os.path.realpath(file) + Fore.WHITE)
+
+    def parse_dir_files(self, dir_name):
+        for (root, _, files) in os.walk(dir_name, topdown=False):
+            for file in files:
+                m = re.match(r'.*\.arxml$', file, re.I)
+                if m:
+                    self.file_list.append(os.path.join(root, file))
+
+    def parse(self, args: List[str]):
+        for input_file in args:
+            if os.path.isdir(input_file):
+                self.parse_dir_files(input_file)
+            else:
+                if input_file[0] == "@":
+                    logging.debug("Parse ARXML list file %s " % input_file)
+                    self.parse_text_file(input_file[1:])
+                else:
+                    self.file_list.append(input_file)

armodel/report/__init__.py

@@ -1 +1 @@
-from .connector_xls_report import ConnectorXlsReport
+from armodel.report.connector_xls_report import ConnectorXlsReport