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

Fix #3669 - Don't copy dual mode files twice. (#3670)

Browse Source
This commit is contained in:
ericchristoffersen
2020-11-23 06:46:48 -08:00
committed by GitHub
parent 8e5a2b42d0
commit afd6552b3b
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Train/Library.cpp
View File

@@ -202,17 +202,21 @@ Library::importFiles(Context *context, QStringList files, bool forcedialog)
// set target filename
targetWorkout = workoutDir + "/" + QFileInfo(source).fileName();
if (targetWorkout != QFileInfo(source).absoluteFilePath() && !source.copy(targetWorkout)) {
QMessageBox::warning(NULL, tr("Copy Workout Failed"),
QString(tr("%1 cannot be written to workout library %2, check permissions and free space")).arg(QFileInfo(targetWorkout).fileName()).arg(workoutDir));
// Some (highly advanced) files can be both workouts and videosync.
// If we find a videosync here in the workout list then it was
// emplaced above so don't the file copy again.
if (!VideoSyncFile::isVideoSync(QFileInfo(source).fileName())) {
if (targetWorkout != QFileInfo(source).absoluteFilePath() && !source.copy(targetWorkout)) {
QMessageBox::warning(NULL, tr("Copy Workout Failed"),
QString(tr("%1 cannot be written to workout library %2, check permissions and free space")).arg(QFileInfo(targetWorkout).fileName()).arg(workoutDir));
}
}
// still add it, it may noit have been scanned...
// still add it, it may not have been scanned...
int mode=0;
ErgFile file(targetWorkout, mode, context);
trainDB->importWorkout(targetWorkout, &file);
}
trainDB->endLUW();