From d2885af46392234324ed95e4cfca405653f79293 Mon Sep 17 00:00:00 2001
From: Albert S <mail@quitesimple.org>
Date: Thu, 2 Jun 2022 10:53:52 +0200
Subject: [PATCH] cli: CommandUpdate: Print total of updated/delete files,
 minor improvements

---
 cli/commandupdate.cpp | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/cli/commandupdate.cpp b/cli/commandupdate.cpp
index 957e143..f4f8d19 100644
--- a/cli/commandupdate.cpp
+++ b/cli/commandupdate.cpp
@@ -12,7 +12,7 @@ int CommandUpdate::handle(QStringList arguments)
 		{{{"v", "verbose"}, "Print path of the files while updating them"},
 		 {{"n", "dry-run"}, "Only print which files would be updated, don't actually update them"},
 		 {"pattern", "Only consider to update files in the index matching the pattern, e. g. */.git/*.", "pattern"},
-		 {{"d", "delete"}, "If a file does not exist anymore, delete it"},
+		 {{"d", "delete"}, "If a file does not exist anymore, delete it from the index"},
 		 {{"c", "continue"},
 		  "Continue adding files, don't exit on first error. If this option is not given, looqs will exit asap, but "
 		  "it's possible that a few files will still be processed. "
@@ -22,7 +22,7 @@ int CommandUpdate::handle(QStringList arguments)
 		});
 
 	parser.addHelpOption();
-	parser.addPositionalArgument("update", "Checks files for changes and updates them", "update");
+	parser.addPositionalArgument("update", "Checks files for changes and updates the index", "update");
 
 	parser.process(arguments);
 	bool keepGoing = parser.isSet("continue");
@@ -42,6 +42,9 @@ int CommandUpdate::handle(QStringList arguments)
 	int limit = 1000;
 	int processedRows = dbService->getFiles(files, pattern, offset, limit);
 
+	unsigned int totalUpdatesFilesCount = 0;
+	unsigned int totalDeletedFilesCount = 0;
+
 	while(processedRows > 0)
 	{
 		QVector<QString> filePathsToUpdate;
@@ -74,7 +77,7 @@ int CommandUpdate::handle(QStringList arguments)
 						if(!this->dbService->deleteFile(fileData.absPath))
 						{
 							Logger::error()
-								<< "Error: Failed to delete" << fileData.absPath << "from databas" << Qt::endl;
+								<< "Error: Failed to delete" << fileData.absPath << "from the index" << Qt::endl;
 							if(!keepGoing)
 							{
 								return 1;
@@ -82,13 +85,14 @@ int CommandUpdate::handle(QStringList arguments)
 						}
 						if(verbose)
 						{
-							Logger::info() << "Deleted" << fileData.absPath << Qt::endl;
+							Logger::info() << "Deleted from index:" << fileData.absPath << Qt::endl;
 						}
+						++totalDeletedFilesCount;
 					}
 					else
 					{
 
-						Logger::info() << "Would delete" << fileData.absPath << Qt::endl;
+						Logger::info() << "Would delete from index" << fileData.absPath << Qt::endl;
 					}
 				}
 			}
@@ -100,14 +104,22 @@ int CommandUpdate::handle(QStringList arguments)
 		{
 			if(!keepGoing)
 			{
-				Logger::error() << "Failed to update all files selected for updating. Updated" << updatedFilesCount
-								<< "out of" << shouldHaveUpdatedCount << "selected for upating" << Qt::endl;
+				Logger::error() << "Failed to update all files selected for updating in this batch. Updated"
+								<< updatedFilesCount << "out of" << shouldHaveUpdatedCount << "selected for updating"
+								<< Qt::endl;
 				return 1;
 			}
 		}
 		offset += limit;
 		files.clear();
 		processedRows = this->dbService->getFiles(files, pattern, offset, limit);
+
+		totalUpdatesFilesCount += static_cast<unsigned int>(updatedFilesCount);
+	}
+	if(!dryRun)
+	{
+		Logger::info() << "Total (updated): " << totalUpdatesFilesCount << Qt::endl;
+		Logger::info() << "Total (deleted from index): " << totalDeletedFilesCount << Qt::endl;
 	}
 
 	return 0;