nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-14 08:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

AthleteDirectory - Folder Structure Part 2 of 2 + Always create .JSON

Browse Source 
... create folder structure for existing and new athletes
... upgrade existing athlete to new structure when opening / incl.
logging and error handling
... convert any "Downloaded" file to .JSON directly - store source file
in /downloads
... convert any "Imported" file to .JSON directly - store source file in
/imports
This commit is contained in:
Joern
2014-11-02 19:55:01 +01:00
parent 0bf8a8ab89
commit 230f028037
42 changed files with 1016 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SplitActivityWizard.cpp
View File

@@ -402,7 +402,7 @@ SplitActivityWizard::setFilesList()
QString
SplitActivityWizard::hasBackup(QString filename)
{
QString backupFilename = context->athlete->home->activities().absolutePath() + "/" + filename + ".bak";
QString backupFilename = context->athlete->home->activities().canonicalPath() + "/" + filename + ".bak";
if (QFile(backupFilename).exists()) {
@@ -432,7 +432,7 @@ SplitActivityWizard::conflicts(QDateTime datetime)
// now make a regexp for all know ride types
foreach(QString suffix, RideFileFactory::instance().suffixes()) {
QString conflict = context->athlete->home->activities().absolutePath() + "/" + targetnosuffix + "." + suffix;
QString conflict = context->athlete->home->activities().canonicalPath() + "/" + targetnosuffix + "." + suffix;
if (QFile(conflict).exists()) returning << conflict;
}
return returning;
@@ -710,7 +710,7 @@ SplitConfirm::initializePage()
// it will always conflict with current ride, so we pick that
// up as a special case.
// we check against existing rides AND the rides we WILL create
QString originalFileName = wizard->context->athlete->home->activities().absolutePath() + "/" + wizard->rideItem->fileName;
QString originalFileName = wizard->context->athlete->home->activities().canonicalPath() + "/" + wizard->rideItem->fileName;
QList<QDateTime> toBeCreated;
foreach(RideFile *ride, wizard->activities) {
@@ -820,7 +820,7 @@ SplitConfirm::validatePage()
for(int i=0; i<wizard->activities.count(); i++) {
QTreeWidgetItem *current = wizard->files->invisibleRootItem()->child(i+off);
QString target = wizard->context->athlete->home->activities().absolutePath() + "/" + current->text(0);
QString target = wizard->context->athlete->home->activities().canonicalPath() + "/" + current->text(0);
JsonFileReader reader;
QFile out(target);