From db34e57a65bb8836faa3f593da8ae5d43bd0162d Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Thu, 20 Nov 2014 11:37:22 +0000
Subject: [PATCH] Ignore Moxy 'delimeters'

.. the Moxy device sends blank lines to delimit recordings
   that we try and parse; so now we just ignore them.
---
 src/CsvRideFile.cpp | 19 +++++++++++++------
 src/MoxyDevice.cpp  |  3 +++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/CsvRideFile.cpp b/src/CsvRideFile.cpp
index 703226cbc..f1ca48e9b 100644
--- a/src/CsvRideFile.cpp
+++ b/src/CsvRideFile.cpp
@@ -255,12 +255,13 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
                     file.close();
                     return NULL;
                 }
+
                 if (degCUnits.indexIn(line) != -1)
                     tempType = degC;
                 else if (degFUnits.indexIn(line) != -1)
                     tempType = degF;
-            }
-            else if (lineno > unitsHeader) {
+
+            } else if (lineno > unitsHeader) {
                 double minutes=0,nm=0,kph=0,watts=0,km=0,cad=0,alt=0,hr=0,dfpm=0, seconds=0.0;
                 double temp=RideFile::NoTemp;
                 double slope=0.0;
@@ -297,8 +298,8 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
                         kph *= KM_PER_MILE;
                         alt *= METERS_PER_FOOT;
                     }
-                }
-                else if (iBike) {
+
+                } else if (iBike) {
                     // this must be iBike
                     // can't find time as a column.
                     // will we have to extrapolate based on the recording interval?
@@ -339,8 +340,14 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
                         alt *= METERS_PER_FOOT;
                         headwind *= KM_PER_MILE;
                     }
-                }
-                else if (moxy)  {
+
+                } else if (moxy)  {
+
+                    // we get crappy lines with no data so ignore them
+                    // I think they're supposed to be delimeters for the file
+                    // content, but are just noise to us !
+                    if (line == (" ,,,,,") || line == ",,,,,") continue;
+
                     // need to get time from second column and note that
                     // there will be gaps when recording drops so shouldn't
                     // assume it is a continuous stream
diff --git a/src/MoxyDevice.cpp b/src/MoxyDevice.cpp
index 475baa012..9721d37da 100644
--- a/src/MoxyDevice.cpp
+++ b/src/MoxyDevice.cpp
@@ -201,6 +201,9 @@ MoxyDevice::download( const QDir &tmpdir,
             updateProgress(QString(tr("Downloading ... [%1 bytes]")).arg(count));
             vbuf[bytes] = '\0';
 
+            // ignore 'delimeters' (they're just noise)
+            if (QString(vbuf) == " ,,,,," || QString(vbuf) == ",,,,,") continue;
+
             // get data
             QDateTime line = dateTimeForRow(vbuf);