diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-12 07:11:34 -0400 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-10-12 07:35:45 -0400 |
| commit | b47e0658cf5e60e18d4c9405e3b28f196ac3e2d8 (patch) | |
| tree | f74c12b881bd1a91943f9ca3f956e15b99dcac7f /uemis-downloader.c | |
| parent | a7e1e7fee1c2afc61b37a0bea76032d169dcee7a (diff) | |
| download | subsurface-b47e0658cf5e60e18d4c9405e3b28f196ac3e2d8.tar.gz | |
Teach uemis downloader about downloading into private trips
Now that we pass in the full device_data_t information, we can look at
the "create_private_dive" flag and decide just how to record newly
downloaded dives properly.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'uemis-downloader.c')
| -rw-r--r-- | uemis-downloader.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/uemis-downloader.c b/uemis-downloader.c index 4e0545193..256f13904 100644 --- a/uemis-downloader.c +++ b/uemis-downloader.c @@ -120,6 +120,17 @@ static struct dive *uemis_start_dive(uint32_t deviceid) return dive; } +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); + else + add_dive_to_trip(dive, devdata->trip); + } + record_dive(dive); +} + /* send text to the importer progress bar */ static void uemis_info(const char *fmt, ...) { @@ -681,7 +692,7 @@ static void parse_tag(struct dive *dive, char *tag, char *val) * index into yet another data store that we read out later. In order to * correctly populate the location and gps data from that we need to remember * the adresses of those fields for every dive that references the divespot. */ -static bool process_raw_buffer(uint32_t deviceid, char *inbuf, char **max_divenr, bool keep_number, int *for_dive) +static bool process_raw_buffer(device_data_t *devdata, uint32_t deviceid, char *inbuf, char **max_divenr, bool keep_number, int *for_dive) { char *buf = strdup(inbuf); char *tp, *bp, *tag, *type, *val; @@ -784,14 +795,14 @@ static bool process_raw_buffer(uint32_t deviceid, char *inbuf, char **max_divenr * be a short read because of some error */ if (done && ++bp < endptr && *bp != '{' && strstr(bp, "{{")) { done = false; - record_dive(dive); + record_uemis_dive(devdata, dive); mark_divelist_changed(true); dive = uemis_start_dive(deviceid); } } if (log) { if (dive->dc.diveid) { - record_dive(dive); + record_uemis_dive(devdata, dive); mark_divelist_changed(true); } else { /* partial dive */ free(dive); @@ -875,7 +886,7 @@ const char *do_uemis_import(device_data_t *data) success = uemis_get_answer(mountpath, "getDivelogs", 3, 0, &result); /* process the buffer we have assembled */ if (mbuf) - if (!process_raw_buffer(deviceidnr, mbuf, &newmax, keep_number, NULL)) { + if (!process_raw_buffer(data, deviceidnr, mbuf, &newmax, keep_number, NULL)) { /* if no dives were downloaded, mark end appropriately */ if (end == -2) end = start - 1; @@ -930,7 +941,7 @@ const char *do_uemis_import(device_data_t *data) success = uemis_get_answer(mountpath, "getDive", 3, 0, &result); if (mbuf) { int divenr; - (void)process_raw_buffer(deviceidnr, mbuf, &newmax, false, &divenr); + (void)process_raw_buffer(data, deviceidnr, mbuf, &newmax, false, &divenr); #if UEMIS_DEBUG & 2 fprintf(debugfile, "got dive %d, looking for dive %d\n", divenr, i); #endif |