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

armodel/cli/connector2xlsx_cli.py

@@ -1,74 +1,72 @@
-import argparse
-import pkg_resources
-import logging
-import sys
-import os.path
-
-from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
-from ..parser import ARXMLParser
-from ..lib import InputFileParser
-from ..report import ConnectorXlsReport
-
-def main():
-    version = pkg_resources.require("armodel")[0].version
-
-    ap = argparse.ArgumentParser()
-    ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
-    ap.add_argument("-w", "--warning", required= False, help= "Skip the error and report it as warning message", action= "store_true")
-    ap.add_argument("INPUT", help = "The path of AUTOSAR XML", nargs='+')
-    ap.add_argument("OUTPUT", help = "The path of output excel file")
-
-    args = ap.parse_args()
-
-    logger = logging.getLogger()
-    
-    formatter = logging.Formatter('[%(levelname)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, 'connector.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:
-        parser = InputFileParser(args.INPUT)
-        filenames = parser.parse()
-
-        options = {}
-        if args.warning:
-            options['warning'] = True
-
-        document = AUTOSAR().getInstance()
-        parser = ARXMLParser(options)
-
-        for filename in filenames:
-            parser.load(filename, document)
-
-        writer = ConnectorXlsReport()
-        writer.import_data(document)
-        writer.write(args.OUTPUT)
-        
-    except Exception as e:
-        #print(e)
-        raise e
-
-if __name__ == "__main__":
+import argparse
+from armodel import __version__
+import logging
+import sys
+import os.path
+
+from armodel.models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
+from armodel.parser import ARXMLParser
+from armodel.lib import InputFileParser
+from armodel.report import ConnectorXlsReport
+
+def main():
+    ap = argparse.ArgumentParser()
+    ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
+    ap.add_argument("-w", "--warning", required= False, help= "Skip the error and report it as warning message", action= "store_true")
+    ap.add_argument("INPUT", help = "The path of AUTOSAR XML", nargs='+')
+    ap.add_argument("OUTPUT", help = "The path of output excel file")
+
+    args = ap.parse_args()
+
+    logger = logging.getLogger()
+    
+    formatter = logging.Formatter('[%(levelname)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, 'connector.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:
+        parser = InputFileParser(args.INPUT)
+        filenames = parser.parse()
+
+        options = {}
+        if args.warning:
+            options['warning'] = True
+
+        document = AUTOSAR().getInstance()
+        parser = ARXMLParser(options)
+
+        for filename in filenames:
+            parser.load(filename, document)
+
+        writer = ConnectorXlsReport()
+        writer.import_data(document)
+        writer.write(args.OUTPUT)
+        
+    except Exception as e:
+        #print(e)
+        raise e
+
+if __name__ == "__main__":
     main()

armodel/cli/connector_update_cli.py

@@ -1,74 +1,72 @@
-import argparse
-import pkg_resources
-import logging
-import sys
-import os.path
-
-from ..writer.arxml_writer import ARXMLWriter
-from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
-from ..parser.arxml_parser import ARXMLParser
-from ..parser.connector_xlsx_parser import ConnectorXlsReader
-
-def main():
-    version = pkg_resources.require("armodel")[0].version
-
-    ap = argparse.ArgumentParser()
-    ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
-    ap.add_argument("-w", "--warning", required= False, help= "Skip the error and report it as warning message", action= "store_true")
-    ap.add_argument("INPUT", help = "The path of input ARXML file")
-    ap.add_argument("MAPPING", help = "The path of connector excel file which exports with connector2xlsx")
-    ap.add_argument("OUTPUT", help = "The path of output ARXML file")
-
-    args = ap.parse_args()
-
-    logger = logging.getLogger()
-    
-    formatter = logging.Formatter('[%(levelname)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, 'connector_update.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:
-        options = {}
-        if args.warning:
-            options['warning'] = True
-
-        document = AUTOSAR().getInstance()
-        parser = ARXMLParser(options)
-        parser.load(args.INPUT, document)
-
-        reader = ConnectorXlsReader()
-        reader.read(args.MAPPING)
-        reader.update(document)
-
-        writer = ARXMLWriter()
-        writer.save(args.OUTPUT, document)
-        
-    except Exception as e:
-        #print(e)
-        logger.error(e)
-        raise e
-
-if __name__ == "__main__":
+import argparse
+from armodel import __version__
+import logging
+import sys
+import os.path
+
+from armodel.writer.arxml_writer import ARXMLWriter
+from armodel.models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
+from armodel.parser.arxml_parser import ARXMLParser
+from armodel.parser.connector_xlsx_parser import ConnectorXlsReader
+
+def main():
+    ap = argparse.ArgumentParser()
+    ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
+    ap.add_argument("-w", "--warning", required= False, help= "Skip the error and report it as warning message", action= "store_true")
+    ap.add_argument("INPUT", help = "The path of input ARXML file")
+    ap.add_argument("MAPPING", help = "The path of connector excel file which exports with connector2xlsx")
+    ap.add_argument("OUTPUT", help = "The path of output ARXML file")
+
+    args = ap.parse_args()
+
+    logger = logging.getLogger()
+    
+    formatter = logging.Formatter('[%(levelname)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, 'connector_update.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:
+        options = {}
+        if args.warning:
+            options['warning'] = True
+
+        document = AUTOSAR().getInstance()
+        parser = ARXMLParser(options)
+        parser.load(args.INPUT, document)
+
+        reader = ConnectorXlsReader()
+        reader.read(args.MAPPING)
+        reader.update(document)
+
+        writer = ARXMLWriter()
+        writer.save(args.OUTPUT, document)
+        
+    except Exception as e:
+        #print(e)
+        logger.error(e)
+        raise e
+
+if __name__ == "__main__":
     main()

armodel/cli/file_list_cli.py

@@ -1,70 +1,70 @@
-import argparse
-import pkg_resources
-import logging
-import sys
-import os.path
-
-from ..parser import FileListParser
-
-def format_filename(filename, type: str):
-    path, file = os.path.split(filename)
-    base, ext = os.path.splitext(file)
-    return os.path.join(path, base + "_" + type + ext)
-        
-def main():
-    version = pkg_resources.require("armodel")[0].version
-
-    ap = argparse.ArgumentParser()
-    ap.description = "Parse the folder to generate ARXML file list. <%s>" % version
-    ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
-    ap.add_argument("--absolute", required= False, help="Absolute path or relative Path", action= "store_true")
-    ap.add_argument("Input", help = "The path contains ARXML file", nargs='+')
-    ap.add_argument("Output", help = "The text contains ARXML file list.")
-
-    args = ap.parse_args()
-
-    logger = logging.getLogger()
-    
-    formatter = logging.Formatter('[%(levelname)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, 'armodel_file_list.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:
-        file_parser = FileListParser()
-        file_parser.parse(args.Input)
-            
-        with open(args.Output, "w") as f_out:
-            for filename in file_parser.get_file_list():
-                if args.absolute:
-                    f_out.write("%s\n" % os.path.realpath(filename))
-                else:
-                    f_out.write("%s\n" % os.path.relpath(filename))
-
-    except Exception as e:
-        #print(e)
-        raise e
-
-if __name__ == "__main__":
+import argparse
+from armodel import __version__
+import logging
+import sys
+import os.path
+
+from armodel.parser import FileListParser
+
+def format_filename(filename, type: str):
+    path, file = os.path.split(filename)
+    base, ext = os.path.splitext(file)
+    return os.path.join(path, base + "_" + type + ext)
+        
+def main():
+    version = __version__
+
+    ap = argparse.ArgumentParser()
+    ap.description = "Parse the folder to generate ARXML file list. <%s>" % version
+    ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
+    ap.add_argument("--absolute", required= False, help="Absolute path or relative Path", action= "store_true")
+    ap.add_argument("Input", help = "The path contains ARXML file", nargs='+')
+    ap.add_argument("Output", help = "The text contains ARXML file list.")
+
+    args = ap.parse_args()
+
+    logger = logging.getLogger()
+    
+    formatter = logging.Formatter('[%(levelname)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, 'armodel_file_list.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:
+        file_parser = FileListParser()
+        file_parser.parse(args.Input)
+            
+        with open(args.Output, "w") as f_out:
+            for filename in file_parser.get_file_list():
+                if args.absolute:
+                    f_out.write("%s\n" % os.path.realpath(filename))
+                else:
+                    f_out.write("%s\n" % os.path.relpath(filename))
+
+    except Exception as e:
+        #print(e)
+        raise e
+
+if __name__ == "__main__":
     main()

armodel/cli/format_xml_cli.py

@@ -1,62 +1,62 @@
-import argparse
-import sys
-import pkg_resources
-import xml.etree.ElementTree as ET
-from xml.dom import minidom
-import logging
-import re
-
-
-def patch_xml(xml: str) -> str:
-    xml = re.sub(r"\<([\w-]+)\/\>", r"<\1></\1>", xml)
-    # xml = re.sub(r"<([\w-]+)\s+(\w+)=(\"[\w-]+\")\/>", r"<\1 \2=\3></\1>", xml)
-    # xml = re.sub(r"&quot;", '"', xml)
-    return xml
-
-
-def perform_format(args):
-    try:
-        # Load XML file 
-        logging.info("Loading XML file: %s" % args.INPUT)
-        tree = ET.parse(args.INPUT)
-        ET.register_namespace("", "http://autosar.org/schema/r4.0")
-        root = tree.getroot()
-
-        # Save the XML file
-        xml = ET.tostring(root, encoding="UTF-8", xml_declaration=True, short_empty_elements=False)
-        
-        dom = minidom.parse(args.INPUT)
-        xml = dom.toprettyxml(indent="  ", encoding="UTF-8")
-
-        xml = patch_xml(xml.decode())
-
-        lines = xml.splitlines()
-
-        logging.info("Saving XML file: %s" % args.OUTPUT)
-
-        with open(args.OUTPUT, "w", encoding="utf-8") as f_out:
-            for line in lines:
-                if line.strip() == "":
-                    continue
-                f_out.write(line + "\n")
-        
-    except Exception as e:
-        logging.error(e)
-        sys.exit(1)
-        
-
-def main():
-    version = pkg_resources.require("armodel")[0].version
-
-    ap = argparse.ArgumentParser()
-    ap.description = "arxml-format ver: %s" % version
-    ap.add_argument("INPUT", help="The path of XML file")
-    ap.add_argument("OUTPUT", help="The path of XML file")
-
-    args = ap.parse_args()
-
-    perform_format(args)
-
-
-if __name__ == "__main__":
-    main()
+import argparse
+import sys
+from armodel import __version__
+import xml.etree.ElementTree as ET
+from xml.dom import minidom
+import logging
+import re
+
+
+def patch_xml(xml: str) -> str:
+    xml = re.sub(r"\<([\w-]+)\/\>", r"<\1></\1>", xml)
+    # xml = re.sub(r"<([\w-]+)\s+(\w+)=(\"[\w-]+\")\/>", r"<\1 \2=\3></\1>", xml)
+    # xml = re.sub(r"&quot;", '"', xml)
+    return xml
+
+
+def perform_format(args):
+    try:
+        # Load XML file 
+        logging.info("Loading XML file: %s" % args.INPUT)
+        tree = ET.parse(args.INPUT)
+        ET.register_namespace("", "http://autosar.org/schema/r4.0")
+        root = tree.getroot()
+
+        # Save the XML file
+        xml = ET.tostring(root, encoding="UTF-8", xml_declaration=True, short_empty_elements=False)
+        
+        dom = minidom.parse(args.INPUT)
+        xml = dom.toprettyxml(indent="  ", encoding="UTF-8")
+
+        xml = patch_xml(xml.decode())
+
+        lines = xml.splitlines()
+
+        logging.info("Saving XML file: %s" % args.OUTPUT)
+
+        with open(args.OUTPUT, "w", encoding="utf-8") as f_out:
+            for line in lines:
+                if line.strip() == "":
+                    continue
+                f_out.write(line + "\n")
+        
+    except Exception as e:
+        logging.error(e)
+        sys.exit(1)
+        
+
+def main():
+    version = __version__
+
+    ap = argparse.ArgumentParser()
+    ap.description = "arxml-format ver: %s" % version
+    ap.add_argument("INPUT", help="The path of XML file")
+    ap.add_argument("OUTPUT", help="The path of XML file")
+
+    args = ap.parse_args()
+
+    perform_format(args)
+
+
+if __name__ == "__main__":
+    main()