mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Uemis downloader: fix algorithm to find matching dive details

Browse source 
Implemented suggestion from Dirk on how to deal with dive details
not being found.

Also cleaned up some unused variables, got rid of the last_log_file_nr
because it's not needed anymore.

One thing in question I still need to check is whether we really need to
decrease the dive_to_read if we find deleted dive details, this is still
in but I dont think it's really needed.

Signed-off-by: glerch <guido.lerch@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
glerch 2015-09-17 16:46:02 +02:00 committed by Dirk Hohndel
parent 02443d295b
commit 2d376de68d
1 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
uemis-downloader.c
View file

@ -69,6 +69,7 @@ static int mbuf_size = 0;
static int max_mem_used = -1; static int max_mem_used = -1;
static int next_table_index = 0; static int next_table_index = 0;
static int dive_to_read = 0;
/* helper function to parse the Uemis data structures */ /* helper function to parse the Uemis data structures */
static void uemis_ts(char *buffer, void *_when) static void uemis_ts(char *buffer, void *_when)
@ -367,7 +368,7 @@ static void buffer_add(char **buffer, int *buffer_size, char *buf)
*buffer = realloc(*buffer, *buffer_size); *buffer = realloc(*buffer, *buffer_size);
strcat(*buffer, buf); strcat(*buffer, buf);
} }
#if UEMIS_DEBUG & 16 #if UEMIS_DEBUG & 8
fprintf(debugfile, "added \"%s\" to buffer - new length %d\n", buf, *buffer_size); fprintf(debugfile, "added \"%s\" to buffer - new length %d\n", buf, *buffer_size);
#endif #endif
} }
@ -435,7 +436,7 @@ static void show_progress(char *buf, const char *what)
char *val = first_object_id_val(buf); char *val = first_object_id_val(buf);
if (val) { if (val) {
/* let the user know what we are working on */ /* let the user know what we are working on */
#if UEMIS_DEBUG & 16 #if UEMIS_DEBUG & 8
fprintf(debugfile, "reading %s\n %s\n %s\n", what, val, buf); fprintf(debugfile, "reading %s\n %s\n %s\n", what, val, buf);
#endif #endif
uemis_info(translate("gettextFromC", "%s %s"), what, val); uemis_info(translate("gettextFromC", "%s %s"), what, val);
@ -789,7 +790,7 @@ static bool process_raw_buffer(device_data_t *devdata, uint32_t deviceid, char *
struct dive *dive = NULL; struct dive *dive = NULL;
char dive_no[10]; char dive_no[10];
#if UEMIS_DEBUG & 4 #if UEMIS_DEBUG & 8
fprintf(debugfile, "p_r_b %s\n", inbuf); fprintf(debugfile, "p_r_b %s\n", inbuf);
#endif #endif
if (for_dive) if (for_dive)
@ -1085,18 +1086,19 @@ static void get_uemis_divespot(const char *mountpath, int divespot_id, struct di
} }
} }
static bool get_matching_dive(int idx, int *dive_to_read, int *last_found_log_file_nr, int *deleted_files, char *newmax, int *uemis_mem_status, struct device_data_t *data, const char* mountpath, const char deviceidnr) static bool get_matching_dive(int idx, char *newmax, int *uemis_mem_status, struct device_data_t *data, const char* mountpath, const char deviceidnr)
{ {
struct dive *dive = data->download_table->dives[idx]; struct dive *dive = data->download_table->dives[idx];
char log_file_no_to_find[20]; char log_file_no_to_find[20];
char dive_to_read_buf[10]; char dive_to_read_buf[10];
bool found = false; bool found = false;
int deleted_files = 0;
snprintf(log_file_no_to_find, sizeof(log_file_no_to_find), "logfilenr{int{%d", dive->dc.diveid); snprintf(log_file_no_to_find, sizeof(log_file_no_to_find), "logfilenr{int{%d", dive->dc.diveid);
while (!found) { while (!found) {
if (import_thread_cancelled) if (import_thread_cancelled)
break; break;
snprintf(dive_to_read_buf, sizeof(dive_to_read_buf), "%d", *dive_to_read); snprintf(dive_to_read_buf, sizeof(dive_to_read_buf), "%d", dive_to_read);
param_buff[2] = dive_to_read_buf; param_buff[2] = dive_to_read_buf;
(void)uemis_get_answer(mountpath, "getDive", 3, 0, NULL); (void)uemis_get_answer(mountpath, "getDive", 3, 0, NULL);
#if UEMIS_DEBUG & 16 #if UEMIS_DEBUG & 16
@ -1122,9 +1124,8 @@ static bool get_matching_dive(int idx, int *dive_to_read, int *last_found_log_fi
* UEMIS unfortunately deletes dives by deleting the dive details and not the logs. */ * UEMIS unfortunately deletes dives by deleting the dive details and not the logs. */
#if UEMIS_DEBUG & 2 #if UEMIS_DEBUG & 2
d_time = get_dive_date_c_string(dive->when); d_time = get_dive_date_c_string(dive->when);
fprintf(debugfile, "Matching divelog id %d from %s with dive details %d\n", dive->dc.diveid, d_time, *dive_to_read); fprintf(debugfile, "Matching divelog id %d from %s with dive details %d\n", dive->dc.diveid, d_time, dive_to_read);
#endif #endif
*last_found_log_file_nr = *dive_to_read;
int divespot_id = uemis_get_divespot_id_by_diveid(dive->dc.diveid); int divespot_id = uemis_get_divespot_id_by_diveid(dive->dc.diveid);
get_uemis_divespot(mountpath, divespot_id, dive); get_uemis_divespot(mountpath, divespot_id, dive);
@ -1132,26 +1133,28 @@ static bool get_matching_dive(int idx, int *dive_to_read, int *last_found_log_fi
/* in this case we found a deleted file, so let's increment */ /* in this case we found a deleted file, so let's increment */
#if UEMIS_DEBUG & 2 #if UEMIS_DEBUG & 2
d_time = get_dive_date_c_string(dive->when); d_time = get_dive_date_c_string(dive->when);
fprintf(debugfile, "TRY matching divelog id %d from %s with dive details %d but details are deleted\n", dive->dc.diveid, d_time, *dive_to_read); fprintf(debugfile, "TRY matching divelog id %d from %s with dive details %d but details are deleted\n", dive->dc.diveid, d_time, dive_to_read);
#endif #endif
*deleted_files = *deleted_files + 1; deleted_files++;
/* mark this log entry as deleted and cleanup later, otherwise we mess up our array */ /* mark this log entry as deleted and cleanup later, otherwise we mess up our array */
dive->downloaded = false; dive->downloaded = false;
#if UEMIS_DEBUG & 2 #if UEMIS_DEBUG & 2
fprintf(debugfile, "Deleted dive from %s, with id %d from table\n", d_time, dive->dc.diveid); fprintf(debugfile, "Deleted dive from %s, with id %d from table\n", d_time, dive->dc.diveid);
#endif #endif
} }
return true;
} else { } else {
/* Ugly, need something better than this uint32_t nr_found = 0;
* essentially, if we start reading divelogs not from the start char *logfilenr = strstr(mbuf, "logfilenr");
* we have no idea on how many log entries are there that have no if (logfilenr) {
* valid dive details */ sscanf(logfilenr, "logfilenr{int{%u", &nr_found);
if (*dive_to_read >= dive->dc.diveid) if (nr_found >= dive->dc.diveid)
*dive_to_read = (*dive_to_read - 2 >= 0 ? *dive_to_read - 2 : 0); dive_to_read = dive_to_read - 2;
if (dive_to_read < -1)
dive_to_read = -1;
}
} }
} }
*dive_to_read = *dive_to_read + 1; dive_to_read++;
} else { } else {
/* At this point the memory of the UEMIS is full, let's cleanup all divelog files were /* At this point the memory of the UEMIS is full, let's cleanup all divelog files were
* we could not match the details to. */ * we could not match the details to. */
@ -1161,8 +1164,8 @@ static bool get_matching_dive(int idx, int *dive_to_read, int *last_found_log_fi
} }
/* decrement iDiveToRead by the amount of deleted entries found to assure /* decrement iDiveToRead by the amount of deleted entries found to assure
* we are not missing any valid matches when processing subsequent logs */ * we are not missing any valid matches when processing subsequent logs */
*dive_to_read = (dive_to_read - deleted_files > 0 ? dive_to_read - deleted_files : 0); dive_to_read = (dive_to_read - deleted_files > 0 ? dive_to_read - deleted_files : 0);
*deleted_files = 0; deleted_files = 0;
return true; return true;
} }
@ -1177,8 +1180,6 @@ const char *do_uemis_import(device_data_t *data)
const char *result = NULL; const char *result = NULL;
char *endptr; char *endptr;
bool success, keep_number = false, once = true; bool success, keep_number = false, once = true;
int deleted_files = 0;
int last_found_log_file_nr = 0;
int match_dive_and_log = 0; int match_dive_and_log = 0;
int uemis_mem_status = UEMIS_MEM_OK; int uemis_mem_status = UEMIS_MEM_OK;
@ -1188,6 +1189,7 @@ const char *do_uemis_import(device_data_t *data)
#endif #endif
if (dive_table.nr == 0) if (dive_table.nr == 0)
keep_number = true; keep_number = true;
uemis_info(translate("gettextFromC", "Initialise communication")); uemis_info(translate("gettextFromC", "Initialise communication"));
if (!uemis_init(mountpath)) { if (!uemis_init(mountpath)) {
free(reqtxt_path); free(reqtxt_path);
@ -1220,7 +1222,7 @@ const char *do_uemis_import(device_data_t *data)
newmax = strdup("0"); newmax = strdup("0");
first = start = atoi(newmax); first = start = atoi(newmax);
dive_to_read = first;
for (;;) { for (;;) {
#if UEMIS_DEBUG & 2 #if UEMIS_DEBUG & 2
debug_round++; debug_round++;
@ -1269,9 +1271,8 @@ const char *do_uemis_import(device_data_t *data)
* What the following part does is to optimize the mapping by using * What the following part does is to optimize the mapping by using
* dive_to_read = the dive deatils entry that need to be read using the object_id * dive_to_read = the dive deatils entry that need to be read using the object_id
* logFileNoToFind = map the logfilenr of the dive details with the object_id = diveid from the get dive logs */ * logFileNoToFind = map the logfilenr of the dive details with the object_id = diveid from the get dive logs */
int dive_to_read = (last_found_log_file_nr > 0 ? last_found_log_file_nr + 1 : start);
for (int i = match_dive_and_log; i < data->download_table->nr; i++) { for (int i = match_dive_and_log; i < data->download_table->nr; i++) {
bool success = get_matching_dive(i, &dive_to_read, &last_found_log_file_nr, &deleted_files, newmax, &uemis_mem_status, data, mountpath, deviceidnr); bool success = get_matching_dive(i, newmax, &uemis_mem_status, data, mountpath, deviceidnr);
if (!success) if (!success)
break; break;
if (import_thread_cancelled) if (import_thread_cancelled)