filesaver: count logic was wrong if --continue wasn't given

Este commit está contenido en:
Albert S. 2019-04-30 23:44:27 +02:00
padre bc9fa97aa0
commit ccb6818e72

Ver fichero

@ -63,7 +63,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
bool keepGoing, bool verbose)
{
std::atomic<bool> terminate{false};
std::atomic<int> errorsCount{0};
std::atomic<int> processedCount{0};
QtConcurrent::blockingMap(paths,
[&](const QString &path)
{
@ -78,27 +78,30 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
SaveFileResult result = saverFunc(path);
if(result == DBFAIL || result == PROCESSFAIL)
{
errorsCount++;
Logger::error() << "Failed to process " << path << endl;
if(!keepGoing)
{
terminate = true;
}
}
if(verbose)
else
{
if(result == SKIPPED)
++processedCount;
if(verbose)
{
Logger::info()
<< "Skipped" << path << "as it already exists in the database" << endl;
}
else if(result == OK)
{
Logger::info() << "Added" << path << endl;
if(result == SKIPPED)
{
Logger::info() << "Skipped" << path
<< "as it already exists in the database" << endl;
}
else if(result == OK)
{
Logger::info() << "Added" << path << endl;
}
}
}
});
return paths.size() - errorsCount.load();
return processedCount.load();
}
SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)