fix gaps in level list from Level.LevelID

Author: noisecode3

.neovim.lua

@@ -85,6 +85,7 @@ require('lint').linters_by_ft = {
   cpp = {'cppcheck', 'cpplint', 'flawfinder', 'clangtidy'},
 }
 
+-- build cppcheck-2.6.3 or you are on you're own with new version
 -- .local/share/nvim/plugged/nvim-lint/lua/lint/linters/cppcheck.lua
 -- cppcheck <= 1.84 doesn't support {column} so the start_col group is ambiguous
 local pattern = [[([^:]*):(%d*):([^:]*): %[([^%]\]*)%] ([^:]*): (.*)]]

src/Data.cpp

@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-#include "Data.hpp"
+#include "../src/Data.hpp"
 
 qint64 Data::getListRowCount() {
     QSqlQuery query(db);
@@ -37,48 +37,45 @@ qint64 Data::getListRowCount() {
 }
 
 QVector<ListItemData> Data::getListItems() {
-    QSqlQuery query(db);
     bool status = true;
+    QSqlQuery query(db);
     QVector<ListItemData> items;
-    qint64 rowCount = getListRowCount();
 
     if (!query.prepare(
-            "SELECT Info.title, Author.value, Info.type, "
+            "SELECT Level.LevelID, Info.title, Author.value, Info.type, "
             "Info.class, Info.release, Info.difficulty, "
-            "Info.duration, Picture.data FROM Level "
+            "Info.duration, Picture.data "
+            "FROM Level "
             "JOIN Info ON Level.infoID = Info.InfoID "
             "JOIN Screens ON Level.LevelID = Screens.levelID "
             "JOIN Picture ON Screens.pictureID = Picture.PictureID "
             "JOIN AuthorList ON Level.LevelID = AuthorList.levelID "
             "JOIN Author ON AuthorList.authorID = Author.AuthorID "
-            "WHERE Level.LevelID = :id "
             "GROUP BY Level.LevelID "
             "ORDER BY MIN(Picture.PictureID) ASC")) {
         qDebug() << "Error preparing query:" << query.lastError().text();
         status = false;
     }
 
     if (status) {
-        for (qint64 i = 1; i <= rowCount; i++) {
-            query.bindValue(":id", i);  // Bind the current LevelID
-            if (query.exec() == true) {
-                while (query.next() == true) {
-                    items.append(ListItemData(
-                        query.value("Info.title").toString(),
-                        query.value("Author.value").toString(),
-                        query.value("Info.type").toInt(),
-                        query.value("Info.class").toInt(),
-                        query.value("Info.release").toString(),
-                        query.value("Info.difficulty").toInt(),
-                        query.value("Info.duration").toInt(),
-                        query.value("Picture.data").toByteArray()));
-                }
-            } else {
-                qDebug() << "Error executing query for Level ID:" << i
-                         << query.lastError().text();
+        if (query.exec()) {
+            while (query.next()) {
+                items.append(ListItemData(
+                    query.value("Level.LevelID").toInt(),
+                    query.value("Info.title").toString(),
+                    query.value("Author.value").toString(),
+                    query.value("Info.type").toInt(),
+                    query.value("Info.class").toInt(),
+                    query.value("Info.release").toString(),
+                    query.value("Info.difficulty").toInt(),
+                    query.value("Info.duration").toInt(),
+                    query.value("Picture.data").toByteArray()));
             }
+        } else {
+            qDebug() << "Error executing query:" << query.lastError().text();
         }
     }
+
     return items;
 }
 

src/Data.hpp

@@ -117,6 +117,7 @@ struct ListItemData {
      * smooths out pixels using `Qt::SmoothTransformation`. The image is centered
      * within a transparent background if its aspect ratio does not perfectly match the target.
      *
+     * @param id The database numeric ID.
      * @param title The TRLE title. Expected to contain a single name.
      * @param author The TRLE author(s). Can be a single name or multiple names separated by commas and spaces.
      * @param type The TRLE type, represented by a numeric ID.
@@ -127,10 +128,10 @@ struct ListItemData {
      * @param imageData The cover image as a `QByteArray`. Supported formats include JPEG, PNG, and WEBP.
      */
     ListItemData(
-        const QString& title, const QString& author, qint64 type,
+        qint64 id, const QString& title, const QString& author, qint64 type,
         qint64 classInput, const QString& releaseDate, qint64 difficulty,
         qint64 duration, QByteArray imageData) :
-        m_title(title), m_author(author), m_type(type),
+        m_id(id), m_title(title), m_author(author), m_type(type),
         m_class(classInput), m_releaseDate(releaseDate),
         m_difficulty(difficulty), m_duration(duration) {
         // Load the image from the byte array
@@ -168,6 +169,7 @@ struct ListItemData {
     }
 
     // Data members
+    qint64 m_id;             ///< The database level id.
     QString m_title;         ///< The TRLE level title.
     QString m_author;        ///< The TRLE author(s), as a string.
     qint64 m_type;           ///< ID of the type of level.

src/Model.cpp

@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-#include "Model.hpp"
+#include "../src/Model.hpp"
 
 Model::Model() {}
 Model::~Model() {}

src/TombRaiderLinuxLauncher.cpp

@@ -12,9 +12,9 @@
  */
 
 #include <algorithm>
-#include "TombRaiderLinuxLauncher.hpp"
+#include "../src/TombRaiderLinuxLauncher.hpp"
 #include "ui_TombRaiderLinuxLauncher.h"
-#include "staticData.hpp"
+#include "../src/staticData.hpp"
 // #include "debug.hpp"
 
 TombRaiderLinuxLauncher::TombRaiderLinuxLauncher(QWidget *parent)
@@ -181,7 +181,7 @@ void TombRaiderLinuxLauncher::generateList(const QList<int>& availableGames) {
         QListWidgetItem *wi =
             new QListWidgetItem(list[i].m_picture, tag);
 
-        wi->setData(Qt::UserRole, QVariant(i + 1));
+        wi->setData(Qt::UserRole, QVariant(list[i].m_id));
         QVariantMap itemData;
         itemData["title"] = list[i].m_title;
         itemData["author"] = list[i].m_author;