From f97ba49b918b6e31f7de568ad3a5088b9b776323 Mon Sep 17 00:00:00 2001
From: Albert S <mail@quitesimple.org>
Date: Tue, 30 Apr 2019 23:44:27 +0200
Subject: [PATCH] filesaver: count logic was wrong if --continue wasn't given

---
 cli/filesaver.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/cli/filesaver.cpp b/cli/filesaver.cpp
index 1a4109d..e9003cf 100644
--- a/cli/filesaver.cpp
+++ b/cli/filesaver.cpp
@@ -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)
 {
     std::atomic<bool> terminate { false };
-    std::atomic<int> errorsCount { 0 };
+    std::atomic<int> processedCount { 0 };
     QtConcurrent::blockingMap(paths, [&](const QString &path) {
         if(terminate.load())
         {
@@ -85,26 +85,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();
 }