Uppdating messages and adding message telling the result is being saved to disk.

Author: klanderfri

ReadMagicCard/ApplicationMessages.cpp

@@ -30,7 +30,21 @@ void ApplicationMessages::printWorkingFolderMessage(wstring mtgFolderPath) {
 	}
 }
 
-void ApplicationMessages::printResultMessage(int numberOfErrors, wstring pathToResultFile) {
+void ApplicationMessages::printSavingResultsToDiskMessage() {
+
+	if (!runSilent) {
+		wcout << L"Saving the results to disk . . ." << endl;
+	}
+}
+
+void ApplicationMessages::printResultsHasBeenSavedToDiskMessage(wstring pathToResultFolder) {
+
+	if (!runSilent) {
+		wcout << L"The results has been written to a folder on disk:" << endl << pathToResultFolder << endl << endl;
+	}
+}
+
+void ApplicationMessages::printResultMessage(int numberOfErrors) {
 
 	if (!runSilent) {
 		wstring message;
@@ -45,10 +59,8 @@ void ApplicationMessages::printResultMessage(int numberOfErrors, wstring pathToR
 			wstring errorWord = (numberOfErrors == 1) ? L"error" : L"errors";
 			message = L"Oh no! There was " + amountOfErrorsStr + L" " + errorWord + L" when reading the cards! :-(";
 		}
-		wcout << endl << message << endl;
+		wcout << message << endl;
 		systemMethods->ResetCommandLineTextColour();
-
-		wcout << endl << L"The results has been written to a result file:" << endl << pathToResultFile << endl;
 	}
 }
 

ReadMagicCard/ApplicationMessages.h

@@ -11,8 +11,12 @@ class ApplicationMessages
 	void printWelcomeMessage();
 	//Prints a message telling the user where the program is looking for card image files.
 	void printWorkingFolderMessage(std::wstring mtgFolderPath);
+	//Prints a message telling the user that the result of the read is being saved to disk.
+	void printSavingResultsToDiskMessage();
+	//Prints a message telling the user that the result of the read has been saved to disk.
+	void printResultsHasBeenSavedToDiskMessage(std::wstring pathToResultFolder);
 	//Prints a message telling the user how the execution went.
-	void printResultMessage(int numberOfErrors, std::wstring pathToResultFile);
+	void printResultMessage(int numberOfErrors);
 	//Prints a message telling the user that there are no files to read.
 	void printNoImagesMessage();
 	//Prints a message telling the user that there are to many files to successfully read them all.

ReadMagicCard/CardCollectionReader.cpp

@@ -79,6 +79,10 @@ vector<CardNameInfo> CardCollectionReader::ExtractCardNames() {
 		cardNameExtraction(range, result, range.end, lengthOfLongestFilename);
 	}
 
+	if (!runSilent) {
+		wcout << endl;
+	}
+
 	return result;
 }
 

ReadMagicCard/CardReaderApplication.cpp

@@ -122,11 +122,13 @@ vector<CardNameInfo> CardReaderApplication::readAllCards(SystemMethods* systemMe
 	vector<CardNameInfo> result = readers->ExtractCardNames();
 
 	//Write the card names to a separate file.
+	messages.printSavingResultsToDiskMessage();
 	StoreCardProcessingData storer = StoreCardProcessingData(systemMethods);
-	wstring pathToResultFile = storer.StoreFinalResult(result);
+	wstring pathToResultFolder = storer.StoreFinalResult(result);
+	messages.printResultsHasBeenSavedToDiskMessage(pathToResultFolder);
 
 	//Give a reassuring message... or not.
-	messages.printResultMessage(readers->AmountOfErrors(), pathToResultFile);
+	messages.printResultMessage(readers->AmountOfErrors());
 
 	//Since we don't need the readers anymore...
 	delete readers;

ReadMagicCard/StoreCardProcessingData.cpp

@@ -43,8 +43,10 @@ wstring StoreCardProcessingData::StoreFinalResult(vector<CardNameInfo> result) {
 		}
 	}
 	textToAdd = textToAdd.substr(0, textToAdd.size() - 1);
+	FileHandling::AddRowToFile(systemMethods, textToAdd, L"CardTitles.txt", SubfolderName);
 
-	return FileHandling::AddRowToFile(systemMethods, textToAdd, L"CardTitles.txt", SubfolderName);
+	wstring resultFolder = FileHandling::GetSubFolderPath(systemMethods, SubfolderName);
+	return resultFolder;
 }
 
 wstring StoreCardProcessingData::StoreOcrConfidence(wstring imageFileName, int numberOfCardReadTries, wstring ocrResult, int ocrConfidence) {