mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-04-15 05:32:21 +00:00
fix CSV date autodetect
There were some missing calls to set Qt::CaseInsensitive.
This commit is contained in:
committed by
Sean Rhea
parent
03666b478e
commit
6692e6daad
@@ -233,6 +233,7 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors) const
|
||||
|
||||
QRegExp rideTime("^.*/(\\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(),
|
||||
@@ -244,7 +245,6 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors) const
|
||||
} 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(),
|
||||
@@ -253,6 +253,8 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors) const
|
||||
rideTime.cap(5).toInt(),
|
||||
rideTime.cap(6).toInt()));
|
||||
rideFile->setStartTime(datetime);
|
||||
} else {
|
||||
qWarning("Failed to set start time");
|
||||
}
|
||||
}
|
||||
return rideFile;
|
||||
|
||||
Reference in New Issue
Block a user