nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2728 from Joern-R/suffix

Browse Source 
Ride File Naming with "." allowed
This commit is contained in:
Joern
2017-12-18 09:54:14 +01:00
committed by GitHub
parent 6b7d1b794c a147165a45
commit fe1313bac1
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/FileIO/RideFile.cpp
View File

@@ -771,8 +771,23 @@ static QByteArray gUncompress(const QByteArray &data)
RideFile *RideFileFactory::openRideFile(Context *context, QFile &file,
QStringList &errors, QList<RideFile*> *rideList) const
{
// is it compressed with gzip?
QString suffix = QFileInfo(file).completeSuffix();
// since some file names contain "." as separator, not only for suffixes
// find the file-type suffix and the compression type in a 2 step approach
QStringList allNameParts = QFileInfo(file).fileName().split(".");
QString compression;
QString suffix;
if (!allNameParts.isEmpty()) {
if (allNameParts.last().toLower() == "zip" ||
allNameParts.last().toLower() == "gz") {
// gz/zip are handled by openRideFile
compression = allNameParts.last();
allNameParts.removeLast();
}
if (!allNameParts.isEmpty()) {
suffix = allNameParts.last();
}
}
// did we uncompress?
QByteArray data;
@@ -782,8 +797,7 @@ RideFile *RideFileFactory::openRideFile(Context *context, QFile &file,
RideFile *result;
// decompress if its compressed data
if (suffix.endsWith(".zip", Qt::CaseInsensitive)) {
suffix.replace(".zip","", Qt::CaseInsensitive);
if (compression == "zip") {
// open zip and uncompress
ZipReader reader(file.fileName());
@@ -795,8 +809,7 @@ RideFile *RideFileFactory::openRideFile(Context *context, QFile &file,
}
// decompress
if (suffix.endsWith(".gz", Qt::CaseInsensitive)) {
suffix.replace(".gz","", Qt::CaseInsensitive);
if (compression == "gz") {
// read and uncompress
file.open(QFile::ReadOnly);

17
src/Gui/RideImportWizard.cpp
View File

@@ -455,9 +455,20 @@ RideImportWizard::process()
suffixes.setCaseSensitivity(Qt::CaseInsensitive);
// strip off gz or zip as openRideFile will sort that for us
QString suffix = thisfile.completeSuffix();
suffix.replace(".zip","", Qt::CaseInsensitive);
suffix.replace(".gz","", Qt::CaseInsensitive);
// since some file names contain "." as separator, not only for suffixes,
// find the file-type suffix in a 2 step approach
QStringList allNameParts = thisfile.fileName().split(".");
QString suffix = tr("undefined");
if (!allNameParts.isEmpty()) {
if (allNameParts.last().toLower() == "zip" ||
allNameParts.last().toLower() == "gz") {
// gz/zip are handled by openRideFile
allNameParts.removeLast();
}
if (!allNameParts.isEmpty()) {
suffix = allNameParts.last();
}
}
if (suffixes.exactMatch(suffix)) {