Add look up for generals.csf in for big archives

Author: MahBoiDeveloper

src/GUI/SetUpWindowsWrapper.cpp

@@ -1,9 +1,11 @@
+#include <QDir>
 #include <QLineEdit>
-#include <QFile>
 #include <QMessageBox>
 
+#include "../Parsers/CSFParser.hpp"
 #include "../Windows/Registry.hpp"
 #include "../Logger.hpp"
+#include "../Exception.hpp"
 #include "WindowManager.hpp"
 #include "ImageManager.hpp"
 #include "LoadFromTheGameWindow.hpp"
@@ -122,18 +124,8 @@ void SetUpWindowsWrapper::BtnBack_Clicked()         { WINDOW_MANAGER->SetCSFFile
 
 void SetUpWindowsWrapper::LoadFromTheGameWindow_AcceptConfiguration()
 {
-    // TODO: Make it load vanila Generals
-    //       Also as search in all big-archives (see more at GZH source code)
     const QString gamePath = QString::fromStdWString(Windows::Registry::GetPathToGame(Windows::Registry::Games::GeneralsZeroHour));
     const QString pathDataEngGenCsf = gamePath + "Data\\English\\generals.csf";
-    const QString pathEngBig = gamePath + "\\EnglishZH.big";
-
-    if (!QFile::exists(pathDataEngGenCsf) && !QFile::exists(pathEngBig))
-    {
-        QMessageBox::critical(nullptr, L10N(PROGRAM_CONSTANTS->GMFILES_SRCH_ERR_HEADER),
-                                       L10N(PROGRAM_CONSTANTS->BIG_NO_ENGLISH_ZH).arg(pathEngBig));
-        return;
-    }
 
     if (QFile::exists(pathDataEngGenCsf))
     {
@@ -142,8 +134,31 @@ void SetUpWindowsWrapper::LoadFromTheGameWindow_AcceptConfiguration()
     else
     {
         LOGMSG("Unable to find " + pathDataEngGenCsf);
-        LOGMSG("Loading " + pathEngBig + "...");
-        WINDOW_MANAGER->SetCSFFilePath(pathEngBig);
+        LOGMSG("Searching generals.csf in all archives");
+
+        QDir gameDir(gamePath);
+        QFileInfoList fileList = gameDir.entryInfoList(QDir::Filter::Files
+                                                       | QDir::Filter::NoDotAndDotDot
+                                                       | QDir::Filter::Readable,
+                                                       QDir::SortFlag::Name);
+        for(const QFileInfo& elem : fileList)
+        {
+            if (elem.suffix().toUpper() != "BIG")
+                continue;
+
+            LOGMSG("Processing " + elem.absoluteFilePath() + "...");
+            try
+            {
+                CSFParser parser(elem.absoluteFilePath());
+                WINDOW_MANAGER->SetCSFFilePath(elem.absoluteFilePath());
+                break;
+            }
+            catch(...)
+            {
+                LOGMSG("String table doesn't exist in archive");
+                continue;
+            }
+        }
     }
 
     WINDOW_MANAGER->StartUpWindow_AcceptConfiguration();

src/GUI/Translations/ru.ts

@@ -236,22 +236,22 @@
         <translation>Невозможно найти &quot;EnglishZH.big&quot; в папке &quot;%1&quot;.</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="113"/>
+        <location filename="../../ProgramConstants.hpp" line="114"/>
         <source>Buildings</source>
         <translation>Здания</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="114"/>
+        <location filename="../../ProgramConstants.hpp" line="115"/>
         <source>Infantry</source>
         <translation>Пехота</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="115"/>
+        <location filename="../../ProgramConstants.hpp" line="116"/>
         <source>Vehicles</source>
         <translation>Техника</translation>
     </message>
     <message>
-        <location filename="../../ProgramConstants.hpp" line="116"/>
+        <location filename="../../ProgramConstants.hpp" line="117"/>
         <source>Aircrafts</source>
         <translation>Авиация</translation>
     </message>

src/ProgramConstants.hpp

@@ -82,12 +82,11 @@ class ProgramConstants
     const QString CSF_NO_OBJECT_ERROR     = QObject::tr("Choosen CSF file doesn't have OBJECT category. Make sure that you are load correct file.");
     const QString CSF_EMPTY_DATA_ENGLISH  = QObject::tr("Unable to find \"generals.csf\" file in \"%1\" folder.");
     const QString CSF_NO_CSF_IN_BIG       = QObject::tr("Unable to find CSF file inside BIG archive \"%1\"");
-    const QString GMFILES_SRCH_ERR_HEADER = QObject::tr("Game files search error");
-    const QString BIG_NO_ENGLISH_ZH       = QObject::tr("Unable to find \"EnglishZH.big\" archive in \"%1\" folder.");
 
     // Other string constants
     const QString HOTKEY_CSF_CATEGORY     = "CONTROLBAR";
     const QString OBJECT_CSF_CATEGORY     = "OBJECT";
+    const QString BIG_ARCHIVE_CSF_PATH    = "Data\\English\\generals.csf";
 
     // Constant containers
     const QVector<QString> GLA_SHORT_NAMES = {"GLA", "TOX", "STL", "DML"};