diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-01-13 10:58:04 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-19 13:48:17 -0800 |
| commit | ff9506b21bbb9910256841dcb577bcb2e19047e8 (patch) | |
| tree | c0bfa63b27ca32fc6d8c223531d5beff6fbb95fe /core/uemis-downloader.c | |
| parent | 1cd0863cca678cf54dfa8a71f3ca9f94bfc4f693 (diff) | |
| download | subsurface-ff9506b21bbb9910256841dcb577bcb2e19047e8.tar.gz | |
Import: don't add to new trip while downloading
Since process_imported_dives() can add dives to a newly generated
trip, this need not be done in the downloading code. This makes
data flow distinctly simpler, as no trip table and no add-new-trip
flag has to be passed down to the libdivecomputer glue code.
Moreover, since now the trip creation is done at the import step
rather than the download step, the latest status of the "add to
new trip" checkbox will be considered.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/uemis-downloader.c')
| -rw-r--r-- | core/uemis-downloader.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/core/uemis-downloader.c b/core/uemis-downloader.c index 5dd6567b6..35dc817b0 100644 --- a/core/uemis-downloader.c +++ b/core/uemis-downloader.c @@ -211,17 +211,6 @@ static struct dive *get_dive_by_uemis_diveid(device_data_t *devdata, uint32_t ob return NULL; } -static void record_uemis_dive(device_data_t *devdata, struct dive *dive) -{ - if (devdata->create_new_trip) { - if (!devdata->trip) - devdata->trip = create_and_hookup_trip_from_dive(dive, &trip_table); - else - add_dive_to_trip(dive, devdata->trip); - } - record_dive_to_table(dive, devdata->download_table); -} - /* send text to the importer progress bar */ static void uemis_info(const char *fmt, ...) { @@ -1024,14 +1013,14 @@ static bool process_raw_buffer(device_data_t *devdata, uint32_t deviceid, char * * be a short read because of some error */ if (done && ++bp < endptr && *bp != '{' && strstr(bp, "{{")) { done = false; - record_uemis_dive(devdata, dive); + record_dive_to_table(dive, devdata->download_table); mark_divelist_changed(true); dive = uemis_start_dive(deviceid); } } if (is_log) { if (dive->dc.diveid) { - record_uemis_dive(devdata, dive); + record_dive_to_table(dive, devdata->download_table); mark_divelist_changed(true); } else { /* partial dive */ free(dive); |