Skip to content

Fix ActivityLaps import: calculate correct stop_time and preserve zer… #310

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

Fix ActivityLaps import: calculate correct stop_time and preserve zer… #310

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
88 changes: 54 additions & 34 deletions garmindb/activity_fit_file_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,37 +88,47 @@ def _write_lap_entry(self, fit_file, message_fields, lap_num):
# It's fastest to just write new data out if the it doesn't currently exist.
activity_id = File.id_from_path(fit_file.filename)
plugin_lap = self._plugin_dispatch('write_lap_entry', self.garmin_act_db_session, fit_file, activity_id, message_fields, lap_num)
if not ActivityLaps.s_exists(self.garmin_act_db_session, {'activity_id' : activity_id, 'lap' : lap_num}):
lap = {
'activity_id' : File.id_from_path(fit_file.filename),
'lap' : lap_num,
'start_time' : fit_file.utc_datetime_to_local(message_fields.start_time),
'stop_time' : fit_file.utc_datetime_to_local(message_fields.timestamp),
'elapsed_time' : message_fields.get('total_elapsed_time'),
'moving_time' : message_fields.get('total_timer_time'),
'start_lat' : message_fields.get('start_position_lat'),
'start_long' : message_fields.get('start_position_long'),
'stop_lat' : message_fields.get('end_position_lat'),
'stop_long' : message_fields.get('end_position_long'),
'distance' : message_fields.get('total_distance'),
'cycles' : message_fields.get('total_cycles'),
'avg_hr' : message_fields.get('avg_heart_rate'),
'max_hr' : message_fields.get('max_heart_rate'),
'avg_rr' : message_fields.get('avg_respiration_rate'),
'max_rr' : message_fields.get('max_respiration_rate'),
'calories' : message_fields.get('total_calories'),
'avg_cadence' : message_fields.get('avg_cadence'),
'max_cadence' : message_fields.get('max_cadence'),
'avg_speed' : message_fields.get('avg_speed'),
'max_speed' : message_fields.get('max_speed'),
'ascent' : message_fields.get('total_ascent'),
'descent' : message_fields.get('total_descent'),
'max_temperature' : message_fields.get('max_temperature'),
'avg_temperature' : message_fields.get('avg_temperature'),
}
lap.update(plugin_lap)
root_logger.debug("writing lap %r for %s", lap, fit_file.filename)
self.garmin_act_db_session.add(ActivityLaps(**lap))

# Calculate stop_time as start_time + elapsed_time since FIT file timestamp is activity start time
start_time = fit_file.utc_datetime_to_local(message_fields.start_time)
elapsed_time = message_fields.get('total_elapsed_time')
if start_time and elapsed_time:
from datetime import timedelta
stop_time = start_time + timedelta(hours=elapsed_time.hour, minutes=elapsed_time.minute,
seconds=elapsed_time.second, microseconds=elapsed_time.microsecond)
else:
stop_time = fit_file.utc_datetime_to_local(message_fields.timestamp)

lap = {
'activity_id' : File.id_from_path(fit_file.filename),
'lap' : lap_num,
'start_time' : start_time,
'stop_time' : stop_time,
'elapsed_time' : elapsed_time,
'moving_time' : message_fields.get('total_timer_time'),
'start_lat' : message_fields.get('start_position_lat'),
'start_long' : message_fields.get('start_position_long'),
'stop_lat' : message_fields.get('end_position_lat'),
'stop_long' : message_fields.get('end_position_long'),
'distance' : message_fields.get('total_distance'),
'cycles' : message_fields.get('total_cycles'),
'avg_hr' : message_fields.get('avg_heart_rate'),
'max_hr' : message_fields.get('max_heart_rate'),
'avg_rr' : message_fields.get('avg_respiration_rate'),
'max_rr' : message_fields.get('max_respiration_rate'),
'calories' : message_fields.get('total_calories'),
'avg_cadence' : message_fields.get('avg_cadence'),
'max_cadence' : message_fields.get('max_cadence'),
'avg_speed' : message_fields.get('avg_speed'),
'max_speed' : message_fields.get('max_speed'),
'ascent' : message_fields.get('total_ascent'),
'descent' : message_fields.get('total_descent'),
'max_temperature' : message_fields.get('max_temperature'),
'avg_temperature' : message_fields.get('avg_temperature'),
}
lap.update(plugin_lap)
root_logger.debug("writing lap %r for %s", lap, fit_file.filename)
ActivityLaps.s_insert_or_update(self.garmin_act_db_session, lap, ignore_none=True, ignore_zero=False)

def _write_split_entry(self, fit_file, message_fields, split_num):
# we don't get splits data from multiple sources so we don't need to coellesce data in the DB.
Expand All @@ -127,12 +137,22 @@ def _write_split_entry(self, fit_file, message_fields, split_num):
plugin_split = self._plugin_dispatch('write_split_entry', self.garmin_act_db_session, fit_file, activity_id, message_fields, split_num)

if not ActivitySplits.s_exists(self.garmin_act_db_session, {'activity_id' : activity_id, 'split' : split_num}):
# Calculate stop_time as start_time + elapsed_time since FIT file timestamp is activity start time
start_time = fit_file.utc_datetime_to_local(message_fields.start_time)
elapsed_time = message_fields.get('total_elapsed_time')
if start_time and elapsed_time:
from datetime import timedelta
stop_time = start_time + timedelta(hours=elapsed_time.hour, minutes=elapsed_time.minute,
seconds=elapsed_time.second, microseconds=elapsed_time.microsecond)
else:
stop_time = fit_file.utc_datetime_to_local(message_fields.timestamp)

split = {
'activity_id' : File.id_from_path(fit_file.filename),
'split' : split_num,
'start_time' : fit_file.utc_datetime_to_local(message_fields.start_time),
'stop_time' : fit_file.utc_datetime_to_local(message_fields.timestamp),
'elapsed_time' : message_fields.get('total_elapsed_time'),
'start_time' : start_time,
'stop_time' : stop_time,
'elapsed_time' : elapsed_time,
'moving_time' : message_fields.get('total_timer_time'),
'avg_hr' : message_fields.get('avg_heart_rate'),
'max_hr' : message_fields.get('max_heart_rate'),
Expand Down