Added check for duplicates in key file

Nikitosiki · Jun 7, 2023 · 8ae39a4 · 8ae39a4
1 parent 4f9a602
commit 8ae39a4
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/LocalizatorDll/LocalizerHandler.cpp b/LocalizatorDll/LocalizerHandler.cpp
@@ -2,6 +2,7 @@
 #include <iostream>
 #include <fstream>
 #include <string>
+#include <algorithm>
 #include "LocalizerHandler.h"
 #include "DllFunctions.h"
 #include "XMLReader.h"
@@ -20,11 +21,20 @@ LocalizerHandler::LocalizerHandler()
  if (!XMLReader::ReadLanguagesFromFile(directoryPath + "\\language\\settings.xml", *this->languages))
  MessageError(NULL, "Error. Reading settings file!", "Localizer Error", MB_ICONERROR | MB_OK);
 
-
  // Ïðîâåðÿåì ÷òî ôàéëû ÿçûêîâ ñóùåñòâóþò
  if (!CheckAllTranslationsExist(directoryPath + "\\language\\dictionaries\\", *this->languages))
  MessageError(NULL, "Error. Not all dictionary files exist!", "Localizer Error", MB_ICONERROR | MB_OK);
 
+ // Ñ÷èòûâàåì ôàéë ñî âñåìè êëþ÷àìè
+ std::vector<std::string> keys;
+ if (!XMLReader::ReadKeysFromFile(directoryPath + "\\language\\keys.xml", keys))
+ MessageError(NULL, "Error. Reading keys file!", "Localizer Error", MB_ICONERROR | MB_OK);
+
+ // Ïðîâåðÿåì ÷òî âñå êëþ÷è óíèêàëüíûå
+ std::string duplicateKey;
+ if (isDuplicates(keys, duplicateKey))
+ MessageError(NULL, ("Error. Key file contains a duplicate: " + duplicateKey).c_str(), "Localizer Error", MB_ICONERROR | MB_OK);
+
  // Ñ÷èòûâàåì íàçâàíèå ôàéëà âûáðàííîãî ÿçûêà, â ôàéëå íàñòðîåê
  std::string fileLanguageName;
  if (!XMLReader::ReadSelectLangFile_FromFile(directoryPath + "\\language\\settings.xml", fileLanguageName))
@@ -34,11 +44,6 @@ LocalizerHandler::LocalizerHandler()
  if (!XMLReader::ReadTranslationsFromFile(directoryPath + "\\language\\dictionaries\\" + fileLanguageName, *this->dictionary))
  MessageError(NULL, ("Error. Reading dictionary file: " + fileLanguageName).c_str(), "Localizer Error", MB_ICONERROR | MB_OK);
 
- // Ñ÷èòûâàåì ôàéë ñî âñåìè êëþ÷àìè
- std::vector<std::string> keys;
- if (!XMLReader::ReadKeysFromFile(directoryPath + "\\language\\keys.xml", keys))
- MessageError(NULL, "Error. Reading keys file!", "Localizer Error", MB_ICONERROR | MB_OK);
-
  // Ïðîâåðÿåì ñëîâàðü íà êîððåêòíîñòü, èñïîëüçóÿ ôàéë ñî âñåìè êëþ÷àìè
  if (!CheckCorrectDictionary(keys, *this->dictionary))
  MessageError(NULL, ("Error. Incorrect keys in dictionary, file: " + fileLanguageName).c_str(), "Localizer Error", MB_ICONERROR | MB_OK);
@@ -131,6 +136,24 @@ const void LocalizerHandler::MessageError(const HWND& hWnd, const LPCSTR& lpText
  ExitProcess(0);
 }
 
+const bool LocalizerHandler::isDuplicates(const std::vector<std::string>& values, std::string& duplicateElement) const
+{
+ std::vector<std::string> sortedValues = values; // Ñîçäàåì êîïèþ âåêòîðà
+ std::sort(sortedValues.begin(), sortedValues.end()); // Ñîðòèðóåì êîïèþ
+
+ // Ïðîâåðÿåì, åñòü ëè ñîñåäíèå ýëåìåíòû â îòñîðòèðîâàííîì âåêòîðå, êîòîðûå ðàâíû
+ for (std::size_t i = 1; i < sortedValues.size(); ++i)
+ {
+ if (sortedValues[i] == sortedValues[i - 1])
+ {
+ duplicateElement = sortedValues[i];
+ return true; // Åñòü äóáëèêàòû
+ }
+ }
+
+ return false; // Äóáëèêàòîâ íåò
+}
+
 const std::string LocalizerHandler::GetDllFolderPath() const
 {
  char path[MAX_PATH];

diff --git a/LocalizatorDll/LocalizerHandler.h b/LocalizatorDll/LocalizerHandler.h
@@ -17,6 +17,8 @@ class LocalizerHandler
 
  const void MessageError(const HWND& hWnd, const LPCSTR& lpText, const LPCSTR& lpCaption, const UINT& uType) const;
 
+ const bool isDuplicates(const std::vector<std::string>& values, std::string& duplicateElement) const;
+
 
 public:
  LocalizerHandler();