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

Skip previously imported files on Auto-Import (#4347)

Browse Source 
If the importable file (after export when inside a .zip/.gz archive)
is present in imports files it means it was previously imported,
so it is skipped on Auto-Import for better performance and to avoid
re-appearance of deleted activities still present in the source folder.
Fixes #3696
Fixes #1892
This commit is contained in:
Alejandro Martinez
2023-04-12 10:28:24 -03:00
committed by GitHub
parent 1ecc6f9ec9
commit c85dab80a8
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Gui/RideImportWizard.cpp
View File

@@ -244,10 +244,24 @@ void
RideImportWizard::init(QList<QString> original, Context * /*mainWindow*/)
{
// save target dir for the file import
this->homeImports = context->athlete->home->imports();
this->homeActivities = context->athlete->home->activities();
this->tmpActivities = context->athlete->home->tmpActivities();
// expand files if they are archives - this may involve unzipping or extracting
// files into a subdirectory, so we also clean-up
// before we close.
QList<QString> files = expandFiles(original);
QList<QString> expanded = expandFiles(original);
QList<QString> files;
if (autoImportMode) {
// on auto-import skip files present in imports folder to avoid re-import
foreach (QString fname, expanded) if (homeImports.entryList(QStringList()<<QFileInfo(fname).baseName()+"*").isEmpty()) files<<fname;
} else {
// all files on manual import
files = expanded;
}
// setup Help
HelpWhatsThis *help = new HelpWhatsThis(this);
@@ -318,11 +332,6 @@ RideImportWizard::init(QList<QString> original, Context * /*mainWindow*/)
statusHeading->setText(tr("Import Status"));
tableWidget->setHorizontalHeaderItem(STATUS_COLUMN, statusHeading);
// save target dir for the file import
this->homeImports = context->athlete->home->imports();
this->homeActivities = context->athlete->home->activities();
this->tmpActivities = context->athlete->home->tmpActivities();
// Fill in the filenames and all the textItems
for (int i=0; i < files.count(); i++) {
QTableWidgetItem *t;