Merge remote-tracking branch 'origin/development' into t196-fix_additional_frame

Author: Tomas Novak

src/canmatrix/canmatrix.py

@@ -113,7 +113,7 @@ class Signal(object):
     is_little_endian = attr.ib(type=bool, default = True)
     is_signed = attr.ib(type=bool, default = True)
     offset = attr.ib(converter = float_factory, default = float_factory(0.0))
-    factor = attr.ib(converter = float_factory, default = float_factory(0.0))
+    factor = attr.ib(converter = float_factory, default = float_factory(1.0))
 
     #    offset = attr.ib(converter = float_factory, default = 0.0)
 
@@ -898,6 +898,8 @@ class CanMatrix(object):
     valueTables = attr.ib(default = attr.Factory(dict))
     envVars = attr.ib(default = attr.Factory(dict))
 
+    load_errors = attr.ib(factory=list)
+
     def __iter__(self):
         return iter(self.frames)
 

src/canmatrix/compare.py

@@ -108,26 +108,29 @@ def compareDb(db1, db2, ignore=None):
         temp._type = "Signal Defines"
         result.addChild(temp)
 
-    for vt1 in db1.valueTables:
-        if vt1 not in db2.valueTables:
-            result.addChild(
-                compareResult(
-                    "deleted",
-                    "valuetable " + vt1,
-                    db1.valueTables))
-        else:
-            result.addChild(
-                compareValueTable(
-                    db1.valueTables[vt1],
-                    db2.valueTables[vt1]))
+    if "VALUETABLES" in ignore and ignore["VALUETABLES"]:
+        pass
+    else:
+        for vt1 in db1.valueTables:
+            if vt1 not in db2.valueTables:
+                result.addChild(
+                    compareResult(
+                        "deleted",
+                        "valuetable " + vt1,
+                        db1.valueTables))
+            else:
+                result.addChild(
+                    compareValueTable(
+                        db1.valueTables[vt1],
+                        db2.valueTables[vt1]))
 
-    for vt2 in db2.valueTables:
-        if vt2 not in db1.valueTables:
-            result.addChild(
-                compareResult(
-                    "added",
-                    "valuetable " + vt2,
-                    db2.valueTables))
+        for vt2 in db2.valueTables:
+            if vt2 not in db1.valueTables:
+                result.addChild(
+                    compareResult(
+                        "added",
+                        "valuetable " + vt2,
+                        db2.valueTables))
 
     propagateChanges(result)
 
@@ -250,11 +253,12 @@ def compareAttributes(ele1, ele2, ignore=None):
 def compareBu(bu1, bu2, ignore=None):
     result = compareResult("equal", "ECU", bu1)
 
-    if bu1.comment != bu2.comment:
-        result.addChild(
-            compareResult(
-                "changed", "ECU", bu1, [
-                    bu1.comment, bu2.comment]))
+    if not "comment" in ignore:
+        if bu1.comment != bu2.comment:
+            result.addChild(
+                compareResult(
+                    "changed", "ECU", bu1, [
+                        bu1.comment, bu2.comment]))
 
     if ignore is not None and "ATTRIBUTE" in ignore and ignore[
             "ATTRIBUTE"] == "*":
@@ -293,15 +297,16 @@ def compareFrame(f1, f2, ignore=None):
                     "extended-Flag: %d" %
                     f1.extended, "extended-Flag: %d" %
                     f2.extended]))
-    if f2.comment is None:
-        f2.addComment("")
-    if f1.comment is None:
-        f1.addComment("")
-    if f1.comment != f2.comment:
-        result.addChild(
-            compareResult(
-                "changed", "FRAME", f1, [
-                    "comment: " + f1.comment, "comment: " + f2.comment]))
+    if not "comment" in ignore:
+        if f2.comment is None:
+            f2.addComment("")
+        if f1.comment is None:
+            f1.addComment("")
+        if f1.comment != f2.comment:
+            result.addChild(
+                compareResult(
+                    "changed", "FRAME", f1, [
+                        "comment: " + f1.comment, "comment: " + f2.comment]))
 
     for s2 in f2.signals:
         s1 = f1.signalByName(s2.name)
@@ -340,14 +345,14 @@ def compareFrame(f1, f2, ignore=None):
 def compareSignal(s1, s2, ignore=None):
     result = compareResult("equal", "SIGNAL", s1)
 
-    if s1.startbit != s2.startbit:
+    if s1.startBit != s2.startBit:
         result.addChild(
             compareResult(
                 "changed", "startbit", s1, [
                     " %d" %
                     s1.startbit, " %d" %
                     s2.startbit]))
-    if s1.signalsize != s2.signalsize:
+    if s1.size != s2.size:
         result.addChild(
             compareResult(
                 "changed", "signalsize", s1, [
@@ -396,17 +401,18 @@ def compareSignal(s1, s2, ignore=None):
             compareResult(
                 "changed", "unit", s1, [
                     s1.unit, s2.unit]))
-    if s1.comment is not None and s2.comment is not None and s1.comment != s2.comment:
-        if s1.comment.replace("\n", " ") != s2.comment.replace("\n", " "):
-            result.addChild(
-                compareResult(
-                    "changed", "comment", s1, [
-                        s1.comment, s2.comment]))
-        else:
-            result.addChild(
-                compareResult(
-                    "changed", "comment", s1, [
-                        "only whitespaces differ", ""]))
+    if not "comment" in ignore:
+        if s1.comment is not None and s2.comment is not None and s1.comment != s2.comment:
+            if s1.comment.replace("\n", " ") != s2.comment.replace("\n", " "):
+                result.addChild(
+                    compareResult(
+                        "changed", "comment", s1, [
+                            s1.comment, s2.comment]))
+            else:
+                result.addChild(
+                    compareResult(
+                        "changed", "comment", s1, [
+                            "only whitespaces differ", ""]))
 
     for receiver in s1.receiver:
         if receiver.strip() not in s2.receiver:
@@ -432,7 +438,10 @@ def compareSignal(s1, s2, ignore=None):
     else:
         result.addChild(compareAttributes(s1, s2, ignore))
 
-    result.addChild(compareValueTable(s1.values, s2.values))
+    if "VALUETABLES" in ignore and ignore["VALUETABLES"]:
+        pass
+    else:
+        result.addChild(compareValueTable(s1.values, s2.values))
 
     return result
 
@@ -498,6 +507,25 @@ def main():
         action="store_true",
         help="show list of frames",
         default=False)
+    parser.add_option(
+        "-c", "--comments",
+        dest="check_comments",
+        action="store_true",
+        help="check changed comments",
+        default=False)
+    parser.add_option(
+        "-a", "--attributes",
+        dest="check_attributes",
+        action="store_true",
+        help="check changed attributes",
+        default=False)
+    parser.add_option(
+        "-t", "--valueTable",
+        dest="ignore_valuetables",
+        action="store_true",
+        help="check changed valuetables",
+        default=False)
+
     (cmdlineOptions, args) = parser.parse_args()
 
     if len(args) < 2:
@@ -526,6 +554,17 @@ def main():
     logger.info("%d Frames found" % (db2.frames.__len__()))
 
     ignore = {}
+
+    if not cmdlineOptions.check_comments:
+        ignore["comment"] = "*"
+
+    if not cmdlineOptions.check_attributes:
+        ignore["ATTRIBUTE"] = "*"
+
+
+    if cmdlineOptions.ignore_valuetables:
+        ignore["VALUETABLES"] = True
+
     if cmdlineOptions.frames:
         onlyInMatrix1 = []
         onlyInMatrix2 = []

src/canmatrix/sym.py

@@ -41,6 +41,48 @@
 enums = "{ENUMS}\n"
 
 
+@attr.s
+class ParsingError(Exception):
+    line_number = attr.ib()
+    line = attr.ib()
+    message = attr.ib(default=None)
+    original = attr.ib(default=None)
+
+    def __attrs_post_init__(self):
+        if self.message is None:
+            self.message = self.line
+
+        self.message = 'line {line_number}: {message}'.format(
+            line_number=self.line_number,
+            message=self.message
+        )
+        super(ParsingError, self).__init__(self.message)
+
+    def __str__(self):
+        return self.message
+
+
+@attr.s
+class DuplicateMuxIdError(ParsingError):
+    id = attr.ib(default=None)
+    old = attr.ib(default=None)
+    new = attr.ib(default=None)
+
+    def __attrs_post_init__(self):
+        if None in (self.id, self.old, self.new):
+            raise Exception('ack')
+
+        self.message = (
+            '{id:X}h already in use'
+            ' (old: {old}, new: {new})'
+        ).format(
+            id=self.id,
+            old=self.old,
+            new=self.new,
+        )
+        super(DuplicateMuxIdError, self).__attrs_post_init__()
+
+
 def format_float(f):
     s = str(f).upper()
     if s.endswith('.0'):
@@ -433,6 +475,14 @@ class Mode(object):
                             multiplexor = int(multiplexor[:-1], 16)
                         else:
                             multiplexor = int(multiplexor)
+                        if multiplexor in frame.mux_names:
+                            raise DuplicateMuxIdError(
+                                id=multiplexor,
+                                old=frame.mux_names[multiplexor],
+                                new=sigName,
+                                line_number=linecount,
+                                line=line,
+                            )
                         frame.mux_names[multiplexor] = sigName
                         indexOffset = 2
 
@@ -568,7 +618,17 @@ class Mode(object):
 #                               print line
 #               else:
 #                       print "Unrecocniced line: " + l + " (%d) " % i
-        except:
+        except Exception as e:
+            if not isinstance(e, ParsingError):
+                ParsingError(
+                    message=str(e),
+                    line_number=linecount,
+                    line=line,
+                    original=e,
+                )
+
+            db.load_errors.append(e)
+
             logger.error("Error decoding line %d" % linecount)
             logger.error(line)
     # TODO: CAMPid 939921818394902983238

src/canmatrix/tests/test_sym.py

@@ -0,0 +1,48 @@
+import io
+import textwrap
+
+import canmatrix.sym
+
+
+def test_colliding_mux_values():
+    f = io.BytesIO(
+        textwrap.dedent(
+            '''\
+            FormatVersion=5.0 // Do not edit this line!
+            Title="a file"
+
+            {SEND}
+
+            [MuxedId]
+            ID=0h
+            Mux=TheMux 0,1 0h
+            Var=Signal unsigned 1,1
+
+            [MuxedId]
+            Mux=FirstMux 0,1 1h
+            Var=Signal unsigned 1,1
+
+            [MuxedId]
+            Mux=SecondMux 0,1 1h
+            Var=Signal unsigned 1,1
+            ''',
+        ).encode('utf-8'),
+    )
+
+    matrix = canmatrix.sym.load(f)
+    error, = matrix.load_errors
+    line_number = 16
+
+    assert len(matrix.load_errors) == 1
+
+    assert isinstance(error, canmatrix.sym.DuplicateMuxIdError)
+
+    assert error.line_number == line_number
+
+    error_string = str(error)
+    assert error_string.startswith(
+        'line {line_number}: '.format(line_number=line_number),
+    )
+
+    assert 'FirstMux' in error_string
+    assert 'SecondMux' in error_string