From f28c360ff59cd3dbf6fc844e15b8aae1f3862699 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Mon, 21 Sep 2009 14:49:14 +0100 Subject: [PATCH] Parse ergomo csv filenames for date --- src/CsvRideFile.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/CsvRideFile.cpp b/src/CsvRideFile.cpp index 66b6336e4..9d6b6f381 100644 --- a/src/CsvRideFile.cpp +++ b/src/CsvRideFile.cpp @@ -241,8 +241,20 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors) const rideTime.cap(5).toInt(), rideTime.cap(6).toInt())); rideFile->setStartTime(datetime); + } else { + // Could be yyyyddmm_hhmmss_NAME.csv (case insensitive) + rideTime.setPattern("(\\d\\d\\d\\d)(\\d\\d)(\\d\\d)_(\\d\\d)(\\d\\d)(\\d\\d)[^\\.]*\\.csv$"); + rideTime.setCaseSensitivity(Qt::CaseInsensitive); + if (rideTime.indexIn(file.fileName()) >= 0) { + QDateTime datetime(QDate(rideTime.cap(1).toInt(), + rideTime.cap(2).toInt(), + rideTime.cap(3).toInt()), + QTime(rideTime.cap(4).toInt(), + rideTime.cap(5).toInt(), + rideTime.cap(6).toInt())); + rideFile->setStartTime(datetime); + } } - return rideFile; }