Skip to content

Report invalid developer base types cleanly #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bolt4243 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Report invalid developer base types cleanly #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion fitparse/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,15 @@ def add_dev_field_description(self, message):
self._append_dev_data_id(dev_data_index)

fields = self.dev_types[int(dev_data_index)]['fields']
base_type = BASE_TYPES.get(base_type_id)
if base_type is None:
raise FitParseError("Unknown developer field base type: %s" % base_type_id)

# 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],
type=base_type,
name=field_name,
units=units,
native_field_num=native_field_num
Expand Down
11 changes: 11 additions & 0 deletions tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,17 @@ def testfile(filename):


class FitFileTestCase(unittest.TestCase):
def test_invalid_developer_base_type_raises_parse_error(self):
fit_data = generate_messages(
mesg_num=207, local_mesg_num=1, field_defs=[(3, 'uint8')], data=[[0]],
) + generate_messages(
mesg_num=206, local_mesg_num=2,
field_defs=[(0, 'uint8'), (1, 'uint8'), (2, 'uint8')], data=[[0, 1, 255]],
)

with self.assertRaises(FitParseError):
FitFile(generate_fitfile(fit_data)).parse()


def test_basic_file_with_one_record(self, endian='<'):
f = FitFile(generate_fitfile(endian=endian))
Expand Down