closing files correctly in log2csv, debug for missing message types

psas_packet/io.py

@@ -168,12 +168,23 @@ def read(self):
         while buff != b'':
             try:
                 bytes_read, data = messages.decode(buff)
+
                 buff = buff[bytes_read:]
                 yield data
+
+                # check boundary
+                if len(buff) < 4:
+                    b = self.fh.read(1 << 20)  # 1 MB
+                    # Check that we didn't actually hit the end of the file
+                    if b == b'':
+                        print('boundary?')
+                        break
+                    buff += b
             except (messages.MessageSizeError):
                 b = self.fh.read(1 << 20)  # 1 MB
                 # Check that we didn't actually hit the end of the file
                 if b == b'':
+                    print('end?')
                     break
                 buff += b
 
@@ -209,5 +220,5 @@ def log2csv(f_in):
                     f_out.write(","+str(data[member['key']]))
                 f_out.write('\n')
 
-    for f_out in files:
-        f_out.close()
+    for fourcc, fh in files.items():
+        fh.close()

psas_packet/messages.py

@@ -44,8 +44,9 @@ def decode(buff):
     # Don't recognize it. Skip it but make a record that we tried to unpack
     if message_cls is None:
         # Debug
-        print(printable(fourcc), length)
-        #print("Skipped unknown header!", fourcc)
+        print('')
+        print("Skipped unknown header: "+printable(fourcc))
+        print('')
         return HEADER.size + length, (printable(fourcc), {'timestamp': timestamp})
 
     unpacked = message_cls.decode(buff[HEADER.size:HEADER.size+length])