Added ability to stop on first mismatch when checking hashes.

BestiaPL · Mar 10, 2023 · 0779dca · 0779dca
1 parent cf963c0
commit 0779dca
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 7 deletions.
diff --git a/source/FarCommon.h b/source/FarCommon.h
@@ -26,7 +26,6 @@ static int optUsePrefix = TRUE;
 static int optHashUppercase = FALSE;
 static int optListDefaultCodepage = CP_UTF8;
 static int optRememberLastUsedAlgo = FALSE;
-static int optIgnoreMissingFiles = FALSE;
 static wchar_t optPrefix[32] = L"check";
 
 #define EDR_SKIP 0

diff --git a/source/IntChecker2-Far3.cpp b/source/IntChecker2-Far3.cpp
@@ -11,10 +11,11 @@
 #include <InitGuid.h>
 #include "Far3Guids.h"
 
-#include "FarCommon.h"
 #include "farhelpers/Far3Menu.hpp"
 #include "farhelpers/Far3Panel.hpp"
 
+#include "FarCommon.h"
+
 static std::wstring AnsiPageName = FormatString(L"ANSI (%d)", GetACP());
 static std::wstring OemPageName = FormatString(L"OEM (%d)", GetOEMCP());
 
@@ -336,7 +337,7 @@ static void DisplayValidationResults(Far3Panel& panel, std::vector<std::wstring>
 	}
 }
 
-static bool AskValidationFileParams(UINT &codepage, int &ignoreMissingFiles)
+static bool AskValidationFileParams(UINT &codepage, bool &ignoreMissingFiles, bool &stopOnFirstFail)
 {
 	const wchar_t* codePageNames[] = {L"UTF-8", AnsiPageName.c_str(), OemPageName.c_str()};
 	const UINT codePageValues[] = {CP_UTF8, CP_ACP, CP_OEMCP};
@@ -352,6 +353,7 @@ static bool AskValidationFileParams(UINT &codepage, int &ignoreMissingFiles)
 	auto cpBox = dlgBuilder.AddComboBox(&selectedCP, NULL, 10, codePageNames, _countof(codePageNames), DIF_DROPDOWNLIST);
 	dlgBuilder.AddTextBefore(cpBox, MSG_GEN_CODEPAGE);
 	dlgBuilder.AddCheckbox(MSG_DLG_IGNORE_MISSING, &ignoreMissingFiles);
+	dlgBuilder.AddCheckbox(MSG_DLG_STOP_ON_FIRST_MISMATCH, &stopOnFirstFail);
 	dlgBuilder.AddOKCancel(MSG_BTN_RUN, MSG_BTN_CANCEL);
 
 	if (dlgBuilder.ShowDialog())
@@ -368,9 +370,10 @@ static bool AskValidationFileParams(UINT &codepage, int &ignoreMissingFiles)
 static bool RunValidateFiles(const wchar_t* hashListPath, bool silent, bool showParamsDialog)
 {
 	UINT fileCodepage = optListDefaultCodepage;
-	int ignoreMissingFiles = optIgnoreMissingFiles;
+	bool ignoreMissingFiles = false;
+	bool stopOnFirstFail = false;
 
-	if (!silent && showParamsDialog && !AskValidationFileParams(fileCodepage, ignoreMissingFiles))
+	if (!silent && showParamsDialog && !AskValidationFileParams(fileCodepage, ignoreMissingFiles, stopOnFirstFail))
 		return false;
 
 	HashList hashes;
@@ -427,7 +430,11 @@ static bool RunValidateFiles(const wchar_t* hashListPath, bool silent, bool show
 			if (RunGeneration(strFullFilePath, fileInfo.Filename, fileInfo.HashAlgo, false, progressCtx, hashValueStr, fAborted, fAutoSkipErrors))
 			{
 				if (!SameHash(fileInfo.HashStr, hashValueStr))
+				{
 					vMismatches.push_back(fileInfo.Filename);
+					if (stopOnFirstFail)
+						break;
+				}
 			}
 			else if (fAborted)
 			{

diff --git a/source/Lang.h b/source/Lang.h
@@ -77,6 +77,7 @@ enum
 	MSG_DLG_PROGRESS_NUMFILES,
 	MSG_DLG_PROGRESS_NUMBYTES,
 	MSG_DLG_IGNORE_MISSING,
+	MSG_DLG_STOP_ON_FIRST_MISMATCH,
 	MSG_DLG_INVALID_PARAMS,
 	MSG_DLG_SELECT_PARAMS,
 	MSG_DLG_BENCHMARKING,

diff --git a/source/Text/IntCheckerEng.lng b/source/Text/IntCheckerEng.lng
@@ -69,7 +69,8 @@
 "Select algorithm"
 "Files:"
 "Bytes:"
-"Ignore missing files"
+"&Ignore missing files"
+"&Stop on first mismatch"
 "Invalid parameters selected"
 "Select parameters"
 "Benchmarking %s"

diff --git a/source/Text/IntCheckerPol.lng b/source/Text/IntCheckerPol.lng
@@ -70,6 +70,7 @@
 "Plików:"
 "Bajtów:"
 "&Ignoruj brakujące pliki"
+"*&Stop on first mismatch"
 "Wybrano nieprawidłowy parametr"
 "Wybierz parametry"
 "Testuję %s"

diff --git a/source/Text/IntCheckerRus.lng b/source/Text/IntCheckerRus.lng
@@ -70,6 +70,7 @@
 "Файлов:"
 "Байт:"
 "Игнорировать отсутствующие файлы"
+"Остановиться на первом несовпадении"
 "Заданы неправильные параметры"
 "Выберите параметры"
 "Тестирую %s"

diff --git a/source/Text/IntCheckerSpa.lng b/source/Text/IntCheckerSpa.lng
@@ -69,7 +69,8 @@
 "Seleccionar algoritmo"
 "Archivos:"
 "Bytes:"
-"*Ignore missing files"
+"*&Ignore missing files"
+"*&Stop on first mismatch"
 "*Invalid parameters selected"
 "*Select parameters"
 "*Benchmarking %s"

diff --git a/source/Text/history_en.txt b/source/Text/history_en.txt
@@ -2,6 +2,7 @@ Changes history:
 
 2.8.2
 - Fixed loading of hash lists in BSD format for several algorithms.
+- Added ability to stop on first mismatch when checking hashes.
 
 2.8.1
 - Only CRC32 and SHA1 can be used in panel comparision mode now (no need to use all algorithms).

diff --git a/source/Text/history_ru.txt b/source/Text/history_ru.txt
@@ -2,6 +2,7 @@
 
 2.8.2
 - ���������� �������� ���-������ � ������� BSD ��� ��������� ����������.
+- ��������� ����������� ��������� ��� ������ ������������ ��� �������� ������.
 
 2.8.1
 - ��� ������ ��������� ������� ��������� ������ CRC32 � SHA1 (��� ������ ������������ ��� ���������).
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ Changes history: @@
 .8.2
     - Fixed loading of hash lists in BSD format for several algorithms.
+    - Added ability to stop on first mismatch when checking hashes.
 .8.1
     - Only CRC32 and SHA1 can be used in panel comparision mode now (no need to use all algorithms).
@@ Expand Down @@