Stop libdivecomputer import when we start seeing old dives

[ext/subsurface.git] / libdivecomputer.c

diff --git a/libdivecomputer.c b/libdivecomputer.c
index d405253d43a6128363fd8e6862ae7baa615ca4e9..a10243dd4d594801f6574e0c9284c8f44dc2458c 100644 (file)
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -118,19 +118,42 @@ static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
        return PARSER_STATUS_SUCCESS;
 }
 
-static void handle_event(struct dive **divep, struct sample *sample, parser_sample_value_t value)
+static void handle_event(struct dive *dive, struct sample *sample, parser_sample_value_t value)
 {
+       int type, time;
        static const char *events[] = {
                "none", "deco", "rbt", "ascent", "ceiling", "workload", "transmitter",
                "violation", "bookmark", "surface", "safety stop", "gaschange",
                "safety stop (voluntary)", "safety stop (mandatory)", "deepstop",
                "ceiling (safety stop)", "unknown", "divetime", "maxdepth",
-               "OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning"};
+               "OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning"
+       };
+       const int nr_events = sizeof(events) / sizeof(const char *);
+       const char *name;
 
-       printf("   <event type=\"%u\" time=\"%u\" flags=\"%u\" value=\"%u\">%s</event>\n",
-               value.event.type, value.event.time, value.event.flags, value.event.value, events[value.event.type]);
-}
+       /*
+        * Just ignore surface events.  They are pointless.  What "surface"
+        * means depends on the dive computer (and possibly even settings
+        * in the dive computer). It does *not* necessarily mean "depth 0",
+        * so don't even turn it into that.
+        */
+       if (value.event.type == SAMPLE_EVENT_SURFACE)
+               return;
+
+       /*
+        * Other evens might be more interesting, but for now we just print them out.
+        */
+       type = value.event.type;
+       name = "invalid event number";
+       if (type < nr_events)
+               name = events[type];
 
+       time = value.event.time;
+       if (sample)
+               time += sample->time.seconds;
+
+       add_event(dive, time, type, value.event.flags, value.event.value, name);
+}
 
 void
 sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata)
@@ -163,7 +186,7 @@ sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata
                sample->temperature.mkelvin = (value.temperature + 273.15) * 1000 + 0.5;
                break;
        case SAMPLE_TYPE_EVENT:
-               handle_event(divep, sample, value);
+               handle_event(dive, sample, value);
                break;
        case SAMPLE_TYPE_RBT:
                printf("   <rbt>%u</rbt>\n", value.rbt);
@@ -193,6 +216,23 @@ static int parse_samples(struct dive **divep, parser_t *parser)
        return parser_samples_foreach(parser, sample_cb, divep);
 }
 
+/*
+ * Check if this dive already existed before the import
+ */
+static int find_dive(struct dive *dive, device_data_t *devdata)
+{
+       int i;
+
+       for (i = 0; i < devdata->preexisting; i++) {
+               struct dive *old = dive_table.dives[i];
+
+               if (dive->when != old->when)
+                       continue;
+               return 1;
+       }
+       return 0;
+}
+
 static int dive_cb(const unsigned char *data, unsigned int size,
        const unsigned char *fingerprint, unsigned int fsize,
        void *userdata)
@@ -279,15 +319,21 @@ static int dive_cb(const unsigned char *data, unsigned int size,
                parser_destroy(parser);
                return rc;
        }
-       record_dive(dive);
 
        parser_destroy(parser);
+
+       /* If we already saw this dive, abort. */
+       if (find_dive(dive, devdata))
+               return 0;
+
+       record_dive(dive);
        return 1;
 }
 
 
 static device_status_t import_device_data(device_t *device, device_data_t *devicedata)
 {
+       devicedata->preexisting = dive_table.nr;
        return device_foreach(device, dive_cb, devicedata);
 }