make all objects able to print their own values

dsmr_parser/objects.py

@@ -1,4 +1,5 @@
 import dsmr_parser.obis_name_mapping
+import datetime
 
 
 class Telegram(object):
@@ -48,7 +49,7 @@ class Telegram(object):
     def __str__(self):
         output = ""
         for attr, value in self:
-            output += "{}: \t {} \t[{}]\n".format(attr, str(value.value), str(value.unit))
+            output += "{}: \t {}\n".format(attr, str(value))
         return output
 
 
@@ -87,6 +88,10 @@ class MBusObject(DSMRObject):
         else:
             return self.values[1]['unit']
 
+    def __str__(self):
+        output = "{}\t[{}] at {}".format(str(self.value), str(self.unit), str(self.datetime.astimezone().isoformat()))
+        return output
+
 
 class CosemObject(DSMRObject):
 
@@ -98,6 +103,13 @@ class CosemObject(DSMRObject):
     def unit(self):
         return self.values[0]['unit']
 
+    def __str__(self):
+        print_value = self.value
+        if isinstance(self.value, datetime.datetime):
+            print_value = self.value.astimezone().isoformat()
+        output = "{}\t[{}]".format(str(print_value), str(self.unit))
+        return output
+
 
 class ProfileGeneric(DSMRObject):
     pass  # TODO implement

dsmr_parser/parsers.py

@@ -183,7 +183,7 @@ class CosemParser(DSMRObjectParser):
         return CosemObject(self._parse(line))
 
 
-class ProfileGenericParser(DSMRObjectParser):
+class ProfileGenericParser(object):
     """
     Power failure log parser.
 
@@ -205,6 +205,22 @@ class ProfileGenericParser(DSMRObjectParser):
     9) Unit of buffer values (Unit of capture objects attribute)
     """
 
+    def _parse(self, line):
+        # Match value groups, but exclude the parentheses. Adapted to also match OBIS code in 3rd position.
+        pattern = re.compile(r'((?<=\()[0-9a-zA-Z\.\*\-\:]{0,}(?=\)))')
+        values = re.findall(pattern, line)
+
+        # Convert empty value groups to None for clarity.
+        values = [None if value == '' else value for value in values]
+
+        buffer_length = int(values[0])
+
+        if (not values) or (len(values) != (buffer_length * 2 + 2)):
+            raise ParseError("Invalid '%s' line for '%s'", line, self)
+
+        return [self.value_formats[i].parse(value)
+                for i, value in enumerate(values)]
+
     def parse(self, line):
         raise NotImplementedError()
 

dsmr_parser/profile_generic_specifications.py

@@ -0,0 +1,14 @@
+from dsmr_parser.parsers import ValueParser, MBusParser
+from dsmr_parser.value_types import timestamp
+
+FAILURE_EVENT = r'0-0\:96\.7\.19'
+
+V4 = {
+    'objects': {
+        FAILURE_EVENT:  MBusParser(
+            ValueParser(timestamp),
+            ValueParser(int)
+        )
+    }
+
+}