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 bc9fa97aa0
commit ccb6818e72
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cli/filesaver.cpp
View File

@ -63,7 +63,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
bool keepGoing, bool verbose) 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, QtConcurrent::blockingMap(paths,
[&](const QString &path) [&](const QString &path)
{ {
@ -78,27 +78,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() if(result == SKIPPED)
<< "Skipped" << path << "as it already exists in the database" << endl; {
} Logger::info() << "Skipped" << path
else if(result == OK) << "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();
} }
SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo) SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)