Merge pull request #852 from angebrandsoftware/preferred-languages

Preferred languages

Author: ebroecker

src/canmatrix/cli/convert.py

@@ -95,6 +95,7 @@ def get_formats():
 @click.option('--arxmlExportVersion', 'arVersion',  default="4.1.0", help="Set output AUTOSAR version\ncurrently only 3.2.3 and 4.1.0 are supported\ndefault 4.1.0")
 @click.option('--arxmlFlexray/--no-arxmlFlexray', 'decode_flexray', default = False, help="EXPERIMENTAL: import basic flexray data from ARXML")
 @click.option('--arxmlEthernet/--no-arxmlEthernet', 'decode_ethernet', default = False, help="EXPERIMENTAL: import basic ethernet data from ARXML")
+@click.option('--preferred-languages', 'preferred_languages', default = "EN,DE", help="the preferred languages will be given priority when there are comments or descriptions available in multiple languages\ndefault EN,DE")
 
 
 # dbc switches

src/canmatrix/formats/arxml.py

@@ -53,10 +53,11 @@
 
 
 class Earxml:
-    def __init__(self):
+    def __init__(self, preferred_languages):
         self.xml_element_cache = dict()  # type: typing.Dict[str, _Element]
         self.path_cache = {}
         self.sn_cache = {}
+        self.preferred_languages = preferred_languages
 
     def fill_caches(self, start_element=None, ar_path=""):
         if start_element is None:
@@ -226,9 +227,12 @@ def get_element_desc(self, element):
         # type: (_Element, _DocRoot) -> str
         """Get element description from XML."""
         desc = self.get_child(element, "DESC")
-        txt = self.get_child(desc, 'L-2[@L="DE"]')
-        if txt is None:
-            txt = self.get_child(desc, 'L-2[@L="EN"]')
+        txt = None
+        for lang in self.preferred_languages:
+            if txt is None:
+                txt = self.get_child(desc, f'L-2[@L="{lang}"]')
+                if txt is None:
+                    break
         if txt is None:
             txt = self.get_child(desc, 'L-2')
         if txt is not None:
@@ -2180,10 +2184,14 @@ def load(file, **options):
     decode_ethernet = options.get("decode_ethernet", False)
     decode_flexray = options.get("decode_flexray", False)
 
+    preferred_languages = options.get("preferred_languages", ["EN,DE"]).split(",")
+    preferred_languages.append("FOR-ALL")
+    logger.debug(f"preferred_languages: {preferred_languages}")
+
     result = {}
     logger.debug("Read arxml ...")
 
-    ea = Earxml()
+    ea = Earxml(preferred_languages = preferred_languages)
     ea.open(file)
 
     com_module = ea.get_short_name_path("/ActiveEcuC/Com")