Skip to content

track record file positions to allow for record editing #137

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

track record file positions to allow for record editing #137

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
15 changes: 12 additions & 3 deletions fitparse/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,13 +348,15 @@ def _parse_definition_message(self, header):
def _parse_raw_values_from_data_message(self, def_mesg):
# Go through mesg's field defs and read them
raw_values = []
raw_values_pos = []
for field_def in def_mesg.field_defs + def_mesg.dev_field_defs:
base_type = field_def.base_type
is_byte = base_type.name == 'byte'
# Struct to read n base types (field def size / base type size)
struct_fmt = str(int(field_def.size / base_type.size)) + base_type.fmt

# Extract the raw value, ask for a tuple if it's a byte type
filepos1=self._filesize-self._bytes_left-2
try:
raw_value = self._read_struct(
struct_fmt, endian=def_mesg.endian, always_tuple=is_byte,
Expand All @@ -374,7 +376,8 @@ def _parse_raw_values_from_data_message(self, def_mesg):
raw_value = base_type.parse(raw_value)

raw_values.append(raw_value)
return raw_values
raw_values_pos.append(filepos1)
return raw_values, raw_values_pos

@staticmethod
def _resolve_subfield(field, def_mesg, raw_values):
Expand Down Expand Up @@ -420,12 +423,12 @@ def _parse_data_message_components(self, header):
raise FitParseError('Got data message with invalid local message type %d' % (
header.local_mesg_num))

raw_values = self._parse_raw_values_from_data_message(def_mesg)
raw_values, raw_values_pos = self._parse_raw_values_from_data_message(def_mesg)
field_datas = [] # TODO: I don't love this name, update on DataMessage too

# TODO: Maybe refactor this and make it simpler (or at least broken
# up into sub-functions)
for field_def, raw_value in zip(def_mesg.field_defs + def_mesg.dev_field_defs, raw_values):
for field_def, raw_value, raw_value_pos in zip(def_mesg.field_defs + def_mesg.dev_field_defs, raw_values, raw_values_pos):
field, parent_field = field_def.field, None
if field:
field, parent_field = self._resolve_subfield(field, def_mesg, raw_values)
Expand Down Expand Up @@ -486,6 +489,7 @@ def _parse_data_message_components(self, header):
parent_field=parent_field,
value=value,
raw_value=raw_value,
filepos=raw_value_pos,
)
)

Expand Down Expand Up @@ -539,10 +543,15 @@ def get_messages(self, name=None, with_definitions=False, as_dict=False):
if with_definitions: # with_definitions implies as_dict=False
as_dict = False

# this is the position of the start of the first message
filepos=self._filesize-self._bytes_left-2
self.recpos=[ filepos ]
names = self._make_set(name)

while not self._complete:
message = self._parse_message()
filepos=self._filesize-self._bytes_left-2 # points to next byte in file
self.recpos.append(filepos) # last byte of this record
if self._should_yield(message, with_definitions, names):
yield message.as_dict() if as_dict else message

Expand Down
4 changes: 3 additions & 1 deletion fitparse/records.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def __str__(self):


class FieldData(RecordBase):
__slots__ = ('field_def', 'field', 'parent_field', 'value', 'raw_value', 'units')
__slots__ = ('field_def', 'field', 'parent_field', 'value', 'raw_value', 'units', 'filepos')

def __init__(self, *args, **kwargs):
super(FieldData, self).__init__(self, *args, **kwargs)
Expand Down Expand Up @@ -224,12 +224,14 @@ def as_dict(self):
'name': self.name, 'def_num': self.def_num, 'base_type': self.base_type.name,
'type': self.type.name, 'units': self.units, 'value': self.value,
'raw_value': self.raw_value,
'filepos': self.filepos,
}

def __repr__(self):
return '<FieldData: %s: %s%s, def num: %d, type: %s (%s), raw value: %s>' % (
self.name, self.value, ' [%s]' % self.units if self.units else '',
self.def_num, self.type.name, self.base_type.name, self.raw_value,
self.filepos,
)

def __str__(self):
Expand Down