py-eb-model 1.0.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

eb_model/cli/os_xdm_2_xls_cli.py

@@ -48,10 +48,11 @@ def main():
 
     try:
         doc = EBModel.getInstance()
+        
         parser = OsXdmParser()
-        writer = OsXdmXlsWriter()
+        parser.parse_xdm(args.INPUT, doc)
 
-        parser.parse(args.INPUT, doc)
+        writer = OsXdmXlsWriter()
         writer.write(args.OUTPUT, doc)
         
     except Exception as e:

eb_model/cli/rte_xdm_2_xls_cli.py

@@ -0,0 +1,68 @@
+import argparse
+import pkg_resources
+import logging
+import sys
+import os.path
+
+from eb_model.parser.eb_parser_factory import EbParserFactory
+
+from ..reporter.excel_reporter.rte_xdm import RteRunnableEntityXlsWriter, RteXdmXlsWriter
+from ..parser.rte_xdm_parser import RteXdmParser
+from ..models import EBModel
+
+def main():
+    version = pkg_resources.require("py_eb_model")[0].version
+
+    ap = argparse.ArgumentParser()
+    ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
+    ap.add_argument("-r", "--runnable", required= False, help= "Export the runnable entities", action= "store_true")
+    ap.add_argument("INPUT", help = "The path of xdm file.", nargs='+')
+    ap.add_argument("OUTPUT", help = "The path of excel file.")
+
+    args = ap.parse_args()
+
+    logger = logging.getLogger()
+    
+    formatter = logging.Formatter('[%(levelname)s] [%(asctime)s]: %(message)s')
+
+    stdout_handler = logging.StreamHandler(sys.stderr)
+    stdout_handler.setFormatter(formatter)
+
+    base_path = os.path.dirname(args.OUTPUT)
+    log_file = os.path.join(base_path, 'rte_xdm_2_xls.log')
+
+    if os.path.exists(log_file):
+        os.remove(log_file)
+
+    file_handler = logging.FileHandler(log_file)
+    file_handler.setFormatter(formatter)
+
+    logger.setLevel(logging.DEBUG)
+    file_handler.setLevel(logging.DEBUG)
+
+    if args.verbose:
+        stdout_handler.setLevel(logging.DEBUG)
+        
+    else:
+        stdout_handler.setLevel(logging.INFO)
+
+    logger.addHandler(file_handler)
+    logger.addHandler(stdout_handler)    
+
+    try:
+        doc = EBModel.getInstance()
+
+        for input_file in args.INPUT:
+            parser = EbParserFactory.create(input_file)
+            parser.parse_xdm(input_file, doc)
+
+        if args.runnable:
+            writer = RteRunnableEntityXlsWriter()
+            writer.write(args.OUTPUT, doc)
+        else:
+            writer = RteXdmXlsWriter()
+            writer.write(args.OUTPUT, doc)
+        
+    except Exception as e:
+        logger.error(e)
+        raise e

eb_model/models/abstract.py

@@ -1,5 +1,6 @@
 from abc import ABCMeta
 from typing import Dict, List
+import re
 
 
 class EcucObject(metaclass=ABCMeta):
@@ -7,29 +8,28 @@ class EcucObject(metaclass=ABCMeta):
         if type(self) == EcucObject:
             raise ValueError("Abstract EcucObject cannot be initialized.")
         
-        self.Name = name
-        self.Parent = parent                # type: EcucObject
+        self.name = name
+        self.parent = parent                # type: EcucObject
 
         if isinstance(parent, EcucContainer):
             parent.addElement(self)
 
     def getName(self):
-        return self.Name
+        return self.name
 
     def setName(self, value):
-        self.Name = value
+        self.name = value
         return self
 
     def getParent(self):
-        return self.Parent
+        return self.parent
 
     def setParent(self, value):
-        self.Parent = value
+        self.parent = value
         return self
 
     def getFullName(self) -> str:
-        return self.Parent.getFullName() + "/" + self.Name
-
+        return self.parent.getFullName() + "/" + self.name
 
 class EcucContainer(EcucObject):
     def __init__(self, parent, name) -> None:
@@ -43,7 +43,7 @@ class EcucContainer(EcucObject):
     
     def addElement(self, object: EcucObject):
         if object.getName() not in self.elements:
-            object.Parent = self
+            object.parent = self
             self.elements[object.getName()] = object
 
         return self
@@ -62,5 +62,23 @@ class EcucContainer(EcucObject):
         return self.elements[name]
 
 class EcucRefType:
-    def __init__(self) -> None:
-        self.link  = ""
+    def __init__(self, value: str) -> None:
+        self.value = value
+
+    def getValue(self) -> str:
+        return self.value
+
+    def setValue(self, value: str):
+        self.value = value
+        return self
+    
+    def __str__(self) -> str:
+        return self.value
+    
+    def getShortName(self) -> str:
+        if self.value is None:
+            raise ValueError("Invalid value of EcucRefType")
+        m = re.match(r'\/[\w\/]+\/(\w+)', self.value)
+        if m:
+            return m.group(1)
+        return self.value

eb_model/models/eb_doc.py

@@ -1,6 +1,4 @@
-
-from typing import List
-
+from .rte_xdm import Rte
 from .os_xdm import Os
 from .abstract import EcucContainer, EcucObject
 
@@ -22,7 +20,7 @@ class EBModel(EcucContainer):
         EBModel.__instance = self
 
     def getFullName(self):
-        return self.Name
+        return self.name
 
     def clear(self):
         self.elements = {}
@@ -43,10 +41,10 @@ class EBModel(EcucContainer):
         container = EcucContainer(self, "Os")
         os = Os(container)
         return self.find("/Os/Os")
-        
-
     
-
-        
-
+    def getRte(self) -> Rte:
+        container = EcucContainer(self, "Rte")
+        rte = Rte(container)
+        return self.find("/Rte/Rte")
     
+