update game list handeling

noisecode3 · noisecode3 · commit aff6038801dd · 2025-06-11T23:40:03.000+02:00
diff --git a/src/Data.cpp b/src/Data.cpp
@@ -218,14 +218,13 @@ ZipData Data::getDownload(const int id) {
     if (status) {
         if (query.exec() == true) {
             if (query.next() == true) {
-                result = ZipData(
-                    query.value("Zip.name").toString(),
-                    query.value("Zip.size").toFloat(),
-                    query.value("Zip.md5sum").toString(),
-                    query.value("Zip.url").toString(),
-                    query.value("Zip.version").toInt(),
-                    query.value("Info.type").toInt(),
-                    query.value("Zip.release").toString());
+                result.setFileName(query.value("Zip.name").toString());
+                result.setMebibyteSize(query.value("Zip.size").toFloat());
+                result.setMD5sum(query.value("Zip.md5sum").toString());
+                result.setURL(query.value("Zip.url").toString());
+                result.setVersion(query.value("Zip.version").toInt());
+                result.setType(query.value("Info.type").toInt());
+                result.setRelease(query.value("Zip.release").toString());
             } else {
                 qDebug() << "No results found for Level ID:" << id;
             }
diff --git a/src/Data.hpp b/src/Data.hpp
@@ -41,17 +41,42 @@ struct File {
  * @brief Folder names game used on Windows.
  *
  * These names are used by steam and installed in the common folder on Linux.
- * Except for `TombEngine (TEN)` I made that one up.
+ * 1-6 first folder name are used by steam
+ *
  */
 struct FolderNames {
-    QMap<int, QString> data = {
-            {0, "null"},
-            {1, "Tomb Raider (I)"},
-            {2, "Tomb Raider (II)"},
-            {3, "TombRaider (III)"},
-            {4, "Tomb Raider (IV) The Last Revelation"},
-            {5, "Tomb Raider (V) Chronicles"},
-            {6, "TombEngine (TEN)"},
+    QMap<int, QStringList> data = {
+            {0, {"null"}},
+            {1, {
+                    "Tomb Raider (I)",
+                    "Tomb Raider 1",
+                    "Tomb Raider I"
+                }},
+            {2, {
+                    "Tomb Raider (II)",
+                    "Tomb Raider 2",
+                    "Tomb Raider II"
+                }},
+            {3, {
+                    "TombRaider (III)",
+                    "Tomb Raider 3",
+                    "Tomb Raider III"
+                }},
+            {4, {
+                    "Tomb Raider (IV) The Last Revelation",
+                    "Tomb Raider 4",
+                    "Tomb Raider - The Last Revelation"
+                }},
+            {5, {
+                    "Tomb Raider (V) Chronicles",
+                    "Tomb Raider 5",
+                    "Tomb Raider - Chronicles"
+                }},
+            {6, {"Tomb Raider (VI) The Angel of Darkness"}},
+            {7, {"Tomb Raider I Unfinished Business"}},
+            {8, {"Tomb Raider II Gold"}},
+            {9, {"Tomb Raider - The Lost Artifact"}},
+            {10, {"The Times - Exclusive Tomb Raider Level"}},
         };
 };
 
@@ -65,12 +90,59 @@ struct FolderNames {
 struct ExecutableNames {
     QMap<int, QString> data = {
             {0, "null"},
-            {1, "tomb.exe"},
+            {1, "dosbox.exe"},
             {2, "Tomb2.exe"},
             {3, "tomb3.exe"},
             {4, "tomb4.exe"},
             {5, "PCTOMB5.EXE"},
-            {6, "TombEngine.exe"},
+            {6, "Launcher.exe"},
+            {7, "tombub.exe"},
+            {8, "tomb2.EXE"},
+            {9, "tr3gold.exe"},
+            {10, "tomb4.exe"},
+        };
+};
+
+struct GameRelease {
+    QMap<int, QString> data = {
+            {0, "null"},
+            {1, "1996-11-14"},
+            {2, "1997-11-21"},
+            {3, "1998-11-20"},
+            {4, "1999-11-24"},
+            {5, "2000-11-17"},
+            {6, "2003-07-01"},
+            {7, "1998-12-31"},
+            {8, "1999-06-04"},
+            {9, "2000-03-00"},
+            {10, "1999-12"},
+        };
+};
+
+/**
+ * @struct MoodFolderNames
+ * @brief Folder names moods used on Windows.
+ *
+ * These made up names that are used installed in the common folder on Linux.
+ */
+struct MoodFolderNames {
+    QMap<int, QString> data = {
+            {0, "null"},
+            {1, "TombEngine (TEN)"}
+        };
+};
+
+/**
+ * @struct MoodExecutableNames
+ * @brief Executable game file names used by unofficial moods.
+ *
+ * These are used as a default starter by using a symbolic link to the executable
+ * It can help simplify running it from steam or lutris.
+ */
+struct MoodExecutableNames {
+    QMap<int, QString> data = {
+            {0, "null"},
+            {1, "TombEngine.exe"},
         };
 };
 
@@ -87,93 +159,75 @@ struct ZipData {
      *
      * Initializes an empty instance of `ZipData`.
      */
-    ZipData() {}
+    ZipData() {
+        m_mebibyteSize = 0.0;
+        m_version = 0;
+        m_type = 0;
+    }
 
     /**
      * @brief This sets the file name metadata.
      * @param fileName TRLE level zip file name.
      */
     inline void setFileName(const QString& fileName) {
+        m_fileName = fileName;
     }
 
     /**
      * @brief This sets the file size metadata.
      * @param size Size in MiB.
      */
-    inline void setZise(const float size) {
+    inline void setMebibyteSize(const float size) {
+        m_mebibyteSize = size;
     }
 
     /**
      * @brief This sets the file md5sum metadata.
      * @param md5sum Checksum of the archive.
      */
-    inline void setMd5sum(const QString& md5sum) {
+    inline void setMD5sum(const QString& MD5sum) {
+        m_MD5sum = MD5sum;
     }
 
     /**
      * @brief This sets the URL for the file.
      * @param url String of download address.
      */
-    inline void setURL(const QString& url) {
+    inline void setURL(const QString& URL) {
+        m_URL = URL;
     }
 
     /**
      * @brief This sets the zip file name metadata.
      * @param version File version from trcustoms.org
      */
     inline void setVersion(const qint64 version) {
+        m_version = version;
     }
 
     /**
      * @brief This sets the zip file name metadata.
      * @param type Level type.
      */
     inline void setType(const qint64 type) {
+        m_type = type;
     }
 
     /**
      * @brief This sets the zip file name metadata.
      * @param release date of file release.
      */
     inline void setRelease(const QString& release) {
+        m_release = m_release;
     }
 
-    /**
-     * @brief Parameterized constructor for `ZipData`.
-     *
-     * This constructor initializes a `ZipData` object with metadata.
-     *
-     * @param zipName TRLE level zip file name.
-     * @param zipSize Size of the file form TRLE in MiB.
-     * @param md5sum checksum of the archive.
-     * @param url String of download address.
-     * @param version File version from trcustoms.org
-     * @param type Level type.
-     * @param release date of file release.
-     */
-    ZipData(
-        const QString& zipName,
-        float zipSize,
-        const QString& md5sum,
-        const QString& url,
-        int version,
-        int type,
-        const QString& release) :
-        name(zipName),
-        mebibyteSize(zipSize),
-        md5sum(md5sum),
-        url(url),
-        version(version),
-        type(type),
-        release(release) {}
-
-    QString name;        ///< The archive file name.
-    float mebibyteSize;  ///< The archive file size in MiB.
-    QString md5sum;      ///< The archive md5sum.
-    QString url;         ///< The URL of the TRLE level download.
-    int version;         ///< The Version of trcustoms archive file.
-    int type;            ///< The TRLE type used to identify a executable.
-    QString release;     ///< The The date of file release from trcustoms.
+    QString m_fileName;    ///< The archive file name.
+    float m_mebibyteSize;  ///< The archive file size in MiB.
+    QString m_MD5sum;      ///< The archive md5sum.
+    QString m_URL;         ///< The URL of the TRLE level download.
+    int m_version;         ///< The Version of trcustoms archive file.
+    int m_type;            ///< The TRLE type used to identify a executable.
+    QString m_release;     ///< The The date of file release from trcustoms.
 };
 
 /**
@@ -196,7 +250,7 @@ struct OriginalGameData {
      *
      * This constructor initializes a `OriginalGameData` object with game metadata.
      *
-     * @param id The numeric game datbase ID.
+     * @param id The numeric game database ID.
      * @param title The TRLE title. Expected to contain a single name.
      * @param shortBody some short game info text.
      * @param type The TRLE type, represented by a numeric ID.
diff --git a/src/Model.cpp b/src/Model.cpp
@@ -71,7 +71,7 @@ QString Model::getGameDirectory(int id) {
     QString value;
     FolderNames folder;
     if (folder.data.contains(id)) {
-        value = folder.data[id];
+        value = folder.data[id][0];
     } else {
         qDebug() << "Id number:" << id << " is not a game.";
     }
@@ -255,21 +255,22 @@ void Model::getLevel(int id) {
     if (id > 0) {
         bool status = false;
         ZipData zipData = data.getDownload(id);
-        downloader.setUrl(zipData.url);
-        downloader.setSaveFile(zipData.name);
+        downloader.setUrl(zipData.m_URL);
+        downloader.setSaveFile(zipData.m_fileName);
         // this if just slips up execution but has nothing to do with the error
-        if (fileManager.checkFile(zipData.name, false)) {
-            qWarning() << "File exists:" << zipData.name;
-            status = getLevelHaveFile(id, zipData.md5sum, zipData.name);
+        if (fileManager.checkFile(zipData.m_fileName, false)) {
+            qWarning() << "File exists:" << zipData.m_fileName;
+            status = getLevelHaveFile(id, zipData.m_MD5sum, zipData.m_fileName);
         } else {
-            qDebug() << "File does not exist:" << zipData.name;
-            status = getLevelDontHaveFile(id, zipData.md5sum, zipData.name);
+            qDebug() << "File does not exist:" << zipData.m_fileName;
+            status = getLevelDontHaveFile(
+                    id, zipData.m_MD5sum, zipData.m_fileName);
         }
         if (status == true) {
             if (!unpackLevel(
                 id,
-                zipData.name,
-                getExecutableName(zipData.type))) {
+                zipData.m_fileName,
+                getExecutableName(zipData.m_type))) {
                 qDebug() << "unpackLevel failed";
             }
         }
diff --git a/src/TombRaiderLinuxLauncher.cpp b/src/TombRaiderLinuxLauncher.cpp
@@ -277,7 +277,7 @@ void TombRaiderLinuxLauncher::onCurrentItemChanged(
         const QModelIndex &current, const QModelIndex &previous) {
     if (current.isValid()) {
         qint64 id = levelListModel->getLid(current);
-        if (id < 0) {  // its the original game
+        if (levelListModel->getListType()) {  // its the original game
             originalSelected(id);
         } else {
             levelDirSelected(id);
@@ -342,14 +342,14 @@ void TombRaiderLinuxLauncher::downloadClicked() {
     QModelIndex current = ui->listViewLevels->currentIndex();
     if (current.isValid()) {
         qint64 id = levelListModel->getLid(current);
-        if (id < 0) {
+        if (levelListModel->getListType()) {
+            qDebug() << "controller.setupGame(" << id << ")";
             ui->listViewLevels->setEnabled(false);
             ui->progressBar->setValue(0);
             ui->stackedWidgetBar->setCurrentWidget(
             ui->stackedWidgetBar->findChild<QWidget*>("progress"));
-            // debugStop(QString("%1").arg(id*(-1)));
-            controller.setupGame(id*(-1));
-        } else if (id > 0) {
+            controller.setupGame(id);
+        } else {
             ui->listViewLevels->setEnabled(false);
             ui->progressBar->setValue(0);
             ui->stackedWidgetBar->setCurrentWidget(
diff --git a/src/levelViewList.hpp b/src/levelViewList.hpp
@@ -90,22 +90,22 @@ class LevelListModel : public QAbstractListModel {
 
         if (m_original == true) {
             if ((index.isValid()) && (row < m_originalMainList.count())) {
-                const OriginalGameData item = m_originalMainList.at(row);
+                const OriginalGameData* item = &m_originalMainList.at(row);
                 switch (role) {
                     case Qt::DisplayRole:
-                        result = item.m_title;
+                        result = item->m_title;
                         break;
                     case Qt::UserRole + 1:
-                        result = item.m_shortBody;
+                        result = item->m_shortBody;
                         break;
                     case Qt::UserRole + 2:
-                        result = item.m_type;
+                        result = item->m_type;
                         break;
                     case Qt::UserRole + 5:
-                        result = item.m_releaseDate;
+                        result = item->m_releaseDate;
                         break;
                     case Qt::UserRole + 7:
-                        result = item.m_cover;
+                        result = item->m_cover;
                         break;
                     case Qt::UserRole + 10:
                         result = true;
@@ -153,8 +153,19 @@ class LevelListModel : public QAbstractListModel {
     }
 
     int getLid(const QModelIndex &index) const {
-        const ListItemData* item = m_filterList.at(index.row());
-        return item->m_trle_id;
+        qint64 id = 0;
+        if (m_original) {
+            const OriginalGameData* item = &m_originalMainList.at(index.row());
+            id =  item->m_game_id;
+        } else {
+            const ListItemData* item = m_filterList.at(index.row());
+            id =  item->m_trle_id;
+        }
+        return id;
+    }
+
+    bool getListType() const {
+        return m_original;
     }
 
     void getMoreCovers() {
