python-fitparse 2.8.0__tar.gz → 2.10.0__tar.gz

{python_fitparse-2.8.0 → python_fitparse-2.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-fitparse
-Version: 2.8.0
+Version: 2.10.0
 Summary: Python library to parse ANT/Garmin .FIT files
 Project-URL: Homepage, https://github.com/nbr23/python-fitparse
 Project-URL: Repository, https://github.com/nbr23/python-fitparse

{python_fitparse-2.8.0 → python_fitparse-2.10.0}/fitparse/base.py

@@ -62,10 +62,28 @@ class DeveloperDataMixin:
         dev_data_index = message.get_raw_value('developer_data_index')
         field_def_num = message.get_raw_value('field_definition_number')
         base_type_id = message.get_raw_value('fit_base_type_id')
-        field_name = message.get_raw_value('field_name') or "unnamed_dev_field_%s" % field_def_num
+        field_name = message.get_raw_value('field_name')
         units = message.get_raw_value("units")
         native_field_num = message.get_raw_value('native_field_num')
 
+        for name, value in (('developer_data_index', dev_data_index),
+                            ('field_definition_number', field_def_num),
+                            ('fit_base_type_id', base_type_id)):
+            if not isinstance(value, int):
+                raise FitParseError(
+                    "Invalid %s=%r in developer field description" % (name, value))
+        if not isinstance(field_name, str) or not field_name:
+            field_name = "unnamed_dev_field_%s" % field_def_num
+        if not isinstance(units, str):
+            units = None
+        base_type = BASE_TYPES.get(base_type_id)
+        if base_type is None:
+            warnings.warn(
+                "Unknown base type %d for developer field %d; falling back to byte encoding."
+                % (base_type_id, field_def_num)
+            )
+            base_type = BASE_TYPE_BYTE
+
         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))
@@ -81,7 +99,7 @@ class DeveloperDataMixin:
         fields[field_def_num] = DevField(
             dev_data_index=dev_data_index,
             def_num=field_def_num,
-            type=BASE_TYPES[base_type_id],
+            type=base_type,
             name=field_name,
             units=units,
             native_field_num=native_field_num
@@ -296,7 +314,8 @@ class FitFileDecoder(DeveloperDataMixin):
             if (field_size % base_type.size) != 0:
                 warnings.warn(
                     "Invalid field size %d for field '%s' of type '%s' (expected a multiple of %d); falling back to byte encoding." % (
-                    field_size, field.name, base_type.name, base_type.size)
+                        field_size, field.name if field else 'unknown_%d' % field_def_num,
+                        base_type.name, base_type.size)
                 )
                 base_type = BASE_TYPE_BYTE
 
@@ -470,7 +489,7 @@ class FitFileDecoder(DeveloperDataMixin):
                 value = raw_value
 
             # Update compressed timestamp field
-            if (field_def.def_num == FIELD_TYPE_TIMESTAMP.def_num) and (raw_value is not None):
+            if (field_def.def_num == FIELD_TYPE_TIMESTAMP.def_num) and isinstance(raw_value, int):
                 self._compressed_ts_accumulator = raw_value
 
             field_datas.append(

{python_fitparse-2.8.0 → python_fitparse-2.10.0}/fitparse/processors.py

@@ -69,12 +69,12 @@ class FitFileDataProcessor:
 
     def process_type_date_time(self, field_data):
         value = field_data.value
-        if value is not None and value >= 0x10000000:
+        if isinstance(value, int) and value >= 0x10000000:
             field_data.value = datetime.datetime.fromtimestamp(timestamp=(UTC_REFERENCE + value), tz=datetime.timezone.utc).replace(tzinfo=None)
             field_data.units = None  # Units were 's', set to None
 
     def process_type_local_date_time(self, field_data):
-        if field_data.value is not None:
+        if isinstance(field_data.value, int):
             # NOTE: This value was created on the device using it's local timezone.
             #       Unless we know that timezone, this value won't be correct. However, if we
             #       assume UTC, at least it'll be consistent.
@@ -82,7 +82,7 @@ class FitFileDataProcessor:
             field_data.units = None
 
     def process_type_localtime_into_day(self, field_data):
-        if field_data.value is not None:
+        if isinstance(field_data.value, int):
             # NOTE: Values larger or equal to 86400 should not be possible.
             #       Additionally, if the value is exactly 86400, it will lead to an error when trying to
             #       create the time with datetime.time(24, 0 , 0).

{python_fitparse-2.8.0 → python_fitparse-2.10.0}/fitparse/records.py

@@ -316,6 +316,9 @@ class ComponentField(RecordBase):
             if self.bit_offset and self.bit_offset >= len(raw_value) << 3:
                 raise ValueError()
 
+            if not all(isinstance(value, int) for value in raw_value):
+                return None
+
             unpacked_num = 0
 
             # Unpack byte array as little endian
@@ -324,11 +327,11 @@ class ComponentField(RecordBase):
 
             raw_value = unpacked_num
 
-        # Mask and shift like a normal number
-        if isinstance(raw_value, int):
-            raw_value = (raw_value >> self.bit_offset) & ((1 << self.bits) - 1)
+        if not isinstance(raw_value, int):
+            return None
 
-        return raw_value
+        # Mask and shift like a normal number
+        return (raw_value >> self.bit_offset) & ((1 << self.bits) - 1)
 
 
 class Crc:

{python_fitparse-2.8.0 → python_fitparse-2.10.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "python-fitparse"
-version = "2.8.0"
+version = "2.10.0"
 description = "Python library to parse ANT/Garmin .FIT files"
 authors = [
     {name = "David Cooper", email = "dave@kupesoft.com"},