crtxcr/looqs
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

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

Browse Source
This commit is contained in:
Albert S. 2019-04-30 23:44:27 +02:00
parent e12d208b5f
commit f97ba49b91
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cli/filesaver.cpp
View File

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