Ignore developer data errors by passing check_developer_data=False

Fixes dtcooper#124

Author: AartGoossens

fitparse/base.py

@@ -21,22 +21,49 @@
 
 
 class DeveloperDataMixin(object):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, check_developer_data=True, **kwargs):
+        self.check_developer_data = check_developer_data
         self.dev_types = {}
 
         super(DeveloperDataMixin, self).__init__(*args, **kwargs)
 
-    def add_dev_data_id(self, message):
-        dev_data_index = message.get_raw_value('developer_data_index')
-        application_id = message.get_raw_value('application_id')
+    def _append_dev_data_id(self, dev_data_index, application_id=None, fields=None):
+        if fields is None:
+            fields = {}
 
         # Note that nothing in the spec says overwriting an existing type is invalid
         self.dev_types[dev_data_index] = {
             'dev_data_index': dev_data_index,
             'application_id': application_id,
-            'fields': {}
+            'fields': fields
         }
 
+    def add_dev_data_id(self, message):
+        dev_data_index = message.get_raw_value('developer_data_index')
+        application_id = message.get_raw_value('application_id')
+
+        self._append_dev_data_id(dev_data_index, application_id)
+
+    def _append_dev_field_description(self, dev_data_index, field_def_num, type=BASE_TYPE_BYTE, name=None,
+                                      units=None, native_field_num=None):
+        if dev_data_index not in self.dev_types:
+            if self.check_developer_data:
+                raise FitParseError("No such dev_data_index=%s found" % (dev_data_index))
+
+            warnings.warn(
+                "Dev type for dev_data_index=%s missing. Adding dummy dev type." % (dev_data_index)
+            )
+            self._append_dev_data_id(dev_data_index)
+
+        self.dev_types[dev_data_index]["fields"][field_def_num] = DevField(
+            dev_data_index=dev_data_index,
+            def_num=field_def_num,
+            type=type,
+            name=name,
+            units=units,
+            native_field_num=native_field_num
+        )
+
     def add_dev_field_description(self, message):
         dev_data_index = message.get_raw_value('developer_data_index')
         field_def_num = message.get_raw_value('field_definition_number')
@@ -46,26 +73,55 @@ def add_dev_field_description(self, message):
         native_field_num = message.get_raw_value('native_field_num')
 
         if dev_data_index not in self.dev_types:
-            raise FitParseError("No such dev_data_index=%s found" % (dev_data_index))
+            if self.check_developer_data:
+                raise FitParseError("No such dev_data_index=%s found" % (dev_data_index))
+
+            warnings.warn(
+                "Dev type for dev_data_index=%s missing. Adding dummy dev type." % (dev_data_index)
+            )
+            self._append_dev_data_id(dev_data_index)
+
         fields = self.dev_types[int(dev_data_index)]['fields']
 
         # Note that nothing in the spec says overwriting an existing field is invalid
-        fields[field_def_num] = DevField(dev_data_index=dev_data_index,
-                                         def_num=field_def_num,
-                                         type=BASE_TYPES[base_type_id],
-                                         name=field_name,
-                                         units=units,
-                                         native_field_num=native_field_num)
-
+        fields[field_def_num] = DevField(
+            dev_data_index=dev_data_index,
+            def_num=field_def_num,
+            type=BASE_TYPES[base_type_id],
+            name=field_name,
+            units=units,
+            native_field_num=native_field_num
+        )
 
     def get_dev_type(self, dev_data_index, field_def_num):
         if dev_data_index not in self.dev_types:
-            raise FitParseError("No such dev_data_index=%s found when looking up field %s" % (dev_data_index, field_def_num))
+            if self.check_developer_data:
+                raise FitParseError(
+                    "No such dev_data_index=%s found when looking up field %s" % (dev_data_index, field_def_num)
+                )
+
+            warnings.warn(
+                "Dev type for dev_data_index=%s missing. Adding dummy dev type." % (dev_data_index)
+            )
+            self._append_dev_data_id(dev_data_index)
 
-        if field_def_num not in self.dev_types[dev_data_index]['fields']:
-            raise FitParseError("No such field %s for dev_data_index %s" % (field_def_num, dev_data_index))
+        dev_type = self.dev_types[dev_data_index]
 
-        return self.dev_types[dev_data_index]['fields'][field_def_num]
+        if field_def_num not in dev_type['fields']:
+            if self.check_developer_data:
+                raise FitParseError(
+                    "No such field %s for dev_data_index %s" % (field_def_num, dev_data_index)
+                )
+
+            warnings.warn(
+                "Field %s for dev_data_index %s missing. Adding dummy field." % (field_def_num, dev_data_index)
+            )
+            self._append_dev_field_description(
+                dev_data_index=dev_data_index,
+                field_def_num=field_def_num
+            )
+
+        return dev_type['fields'][field_def_num]
 
 
 class FitFileDecoder(DeveloperDataMixin):
@@ -554,12 +610,14 @@ def _parse_data_message(self, header):
 class UncachedFitFile(DataProcessorMixin, FitFileDecoder):
     """FitFileDecoder with data processing"""
 
-    def __init__(self, fileish, check_crc=True, data_processor=None):
+    def __init__(self, fileish, *args, check_crc=True, data_processor=None, **kwargs):
         # Ensure all optional params are passed as kwargs
         super(UncachedFitFile, self).__init__(
             fileish,
+            *args,
             check_crc=check_crc,
-            data_processor=data_processor
+            data_processor=data_processor,
+            **kwargs
         )