fix LevelListProxy::getItemType logic

Author: noisecode3

CMakeLists.txt

@@ -18,29 +18,33 @@ find_package(Qt5 COMPONENTS Core Gui Test Widgets WebEngineWidgets Sql REQUIRED)
 
 find_package(CURL REQUIRED)
 
+# Add miniz as a subdirectory
 if(NOT EXISTS "${CMAKE_SOURCE_DIR}/libs/miniz/CMakeLists.txt")
     message(STATUS "Submodule 'libs/miniz' not found. Updating submodules...")
     execute_process(
         COMMAND git submodule update --init --recursive
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     )
-    file(READ "${CMAKE_SOURCE_DIR}/libs/miniz/CMakeLists.txt" cmake)
+    file(READ "${CMAKE_SOURCE_DIR}/libs/miniz/CMakeLists.txt" MINIZ_CMAKE)
     string(REPLACE "cmake_minimum_required(VERSION 3.5)"
-        "cmake_minimum_required(VERSION 3.16)" my_cmake "${cmake}")
-    file(WRITE "${CMAKE_SOURCE_DIR}/libs/miniz/CMakeLists.txt" "${my_cmake}")
-endif()
-
-if(NOT EXISTS "${CMAKE_SOURCE_DIR}/database/tombll.db")
-    message(STATUS "Database not found, running get_trle.sh...")
-    execute_process(
-        COMMAND bash "${CMAKE_SOURCE_DIR}/database/get_trle.sh"
-        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+        "cmake_minimum_required(VERSION 3.16)"
+        NEW_MINIZ_CMAKE
+        "${MINIZ_CMAKE}"
+    )
+    file(WRITE "${CMAKE_SOURCE_DIR}/libs/miniz/CMakeLists.txt"
+        "${NEW_MINIZ_CMAKE}"
     )
 endif()
-
 add_subdirectory(libs/miniz)
 
 # Add LIEF as a subdirectory
+if(NOT EXISTS "${CMAKE_SOURCE_DIR}/libs/LIEF/CMakeLists.txt")
+    message(STATUS "Submodule 'libs/LIEF' not found. Updating submodules...")
+    execute_process(
+        COMMAND git submodule update --init --recursive
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    )
+endif()
 set(LIEF_INSTALL OFF CACHE BOOL "Disable installation of LIEF")
 set(LIEF_EXAMPLES OFF)
 set(LIEF_TESTS OFF)
@@ -51,18 +55,52 @@ set(LIEF_PE ON)
 set(LIEF_MACHO OFF)
 set(LIEF_DEX OFF)
 set(LIEF_ART OFF)
+add_subdirectory(libs/LIEF)
 
-if(NOT EXISTS "${CMAKE_SOURCE_DIR}/libs/LIEF/CMakeLists.txt"
-        AND NOT NO_DATABASE
+# Add libbacktrace as a subdirectory
+if(NOT EXISTS "${CMAKE_SOURCE_DIR}/libs/libbacktrace/configure")
+    message(STATUS
+        "Submodule 'libs/libbacktrace' not found. Updating submodules..."
     )
-    message(STATUS "Submodule 'libs/LIEF' not found. Updating submodules...")
     execute_process(
         COMMAND git submodule update --init --recursive
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     )
 endif()
+if(EXISTS "${CMAKE_SOURCE_DIR}/libs/libbacktrace/configure")
+    message(STATUS "Running autoconf to prepare libbacktrace")
+    execute_process(
+        COMMAND bash "${CMAKE_SOURCE_DIR}/libs/libbacktrace/configure"
+        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/libs/libbacktrace"
+        RESULT_VARIABLE AUTOCONF_RESULT
+    )
+    if(NOT AUTOCONF_RESULT EQUAL 0)
+        message(
+            FATAL_ERROR
+            "Autoconf failed with exit code ${AUTOCONF_RESULT}"
+        )
+    endif()
+    execute_process(
+        COMMAND make
+        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/libs/libbacktrace"
+        RESULT_VARIABLE MAKE_RESULT
+    )
+    if(NOT MAKE_RESULT EQUAL 0)
+        message(
+            FATAL_ERROR
+            "Make failed with exit code ${MAKE__RESULT}"
+        )
+    endif()
+endif()
 
-add_subdirectory(libs/LIEF)
+
+if(NOT EXISTS "${CMAKE_SOURCE_DIR}/database/tombll.db")
+    message(STATUS "Database not found, running get_trle.sh...")
+    execute_process(
+        COMMAND bash "${CMAKE_SOURCE_DIR}/database/get_trle.sh"
+        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+    )
+endif()
 
 set(SOURCES_TESTS
     test/test.hpp
@@ -93,6 +131,7 @@ set(SOURCES_MC
     src/PyRunner.hpp
     src/Runner.cpp
     src/Runner.hpp
+    src/assert.hpp
     src/binary.hpp
     src/binary.cpp
     src/main.cpp
@@ -114,6 +153,7 @@ set(LINK_COMMON
     miniz
     LIEF::LIEF
     ${CURL_LIBRARY}
+    "${CMAKE_SOURCE_DIR}/libs/libbacktrace/.libs/libbacktrace.a"
 )
 
 set(LINK_GUI
@@ -124,6 +164,7 @@ set(INCLUDE_DIR
     ${CURL_INCLUDE_DIR}
     libs/miniz
     libs/LIEF/include
+    libs/libbacktrace
     src
 )
 

setup_nvim_lsp.sh

@@ -15,5 +15,6 @@ cmake \
 cd ..
 
 git config submodule.libs/miniz.ignore all
+git config submodule.libs/libbacktrace.ignore all
 
 ./build.sh

src/Data.hpp

@@ -25,6 +25,8 @@
 #include <QSqlError>
 #include <QSqlQuery>
 
+#include "../src/assert.hpp"
+
 /**
  * @struct FileListItem
  * @brief Files object to keep track of files.
@@ -251,26 +253,32 @@ struct ListItemData {
 
 
     void setGameId(const qint64 id) {
+        Q_ASSERT_WITH_TRACE(id != 0);
         m_game_id = id;
     }
 
     void setLid(const qint64 id) {
+        Q_ASSERT_WITH_TRACE(id != 0);
         m_trle_id = id;
     }
 
     void setTitle(const QString& title) {
+        Q_ASSERT_WITH_TRACE(!title.isEmpty());
         m_title = title;
     }
 
     void setAuthors(const QStringList& authors) {
+        Q_ASSERT_WITH_TRACE(!authors.isEmpty());
         m_authors = authors;
     }
 
     void setShortBody(const QString& shortBody) {
+        Q_ASSERT_WITH_TRACE(!shortBody.isEmpty());
         m_shortBody = shortBody;
     }
 
     void setType(const qint64 type) {
+        Q_ASSERT_WITH_TRACE(type != 0);
         m_type = type;
     }
 
@@ -287,6 +295,7 @@ struct ListItemData {
     }
 
     void setReleaseDate(const QString& releaseDate) {
+        Q_ASSERT_WITH_TRACE(!releaseDate.isEmpty());
         m_releaseDate = releaseDate;
     }
 

src/LevelViewList.cpp

@@ -103,11 +103,12 @@ quint64 LevelListProxy::getLid(const QModelIndex &i) {
     if (id == 0) {
         id = sourceModel()->data(i, Qt::UserRole+10).toInt();
     }
+    Q_ASSERT_WITH_TRACE(id != 0);
     return id;
 }
 
 bool LevelListProxy::getItemType(const QModelIndex &i) {
-    return sourceModel()->data(i, Qt::UserRole+10).toBool();
+    return sourceModel()->data(i, Qt::UserRole+1).toBool();
 }
 
 bool LevelListProxy::getInstalled(const QModelIndex &i) {

src/Model.cpp

@@ -14,6 +14,8 @@
 #include "../src/Model.hpp"
 #include "../src/Data.hpp"
 #include "../src/Path.hpp"
+#include "../src/assert.hpp"
+#include <qglobal.h>
 
 Model::Model() {}
 Model::~Model() {}
@@ -283,7 +285,7 @@ bool Model::setLink(int id) {
 void Model::setupGame(int id) {
     QVector<FileListItem> list = data.getFileList(id);
     const size_t s = list.size();
-    assert(s != 0);
+    Q_ASSERT_WITH_TRACE(s != 0);
     Path from(Path::programFiles);
     Path to(Path::resource);
 

src/TombRaiderLinuxLauncher.cpp

@@ -499,6 +499,8 @@ void TombRaiderLinuxLauncher::downloadClicked() {
     QModelIndex current = ui->listViewLevels->currentIndex();
     if (current.isValid()) {
         qint64 id = levelListProxy->getLid(current);
+        qDebug() << "void TombRaiderLinuxLauncher" <<
+                    "::downloadClicked() quint64 id: " << id; 
         if (levelListProxy->getItemType(current)) {
             ui->listViewLevels->setEnabled(false);
             ui->progressBar->setValue(0);

src/assert.hpp

@@ -0,0 +1,96 @@
+/* TombRaiderLinuxLauncher
+ * Martin Bångens Copyright (C) 2025
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef SRC_ASSERT_HPP_
+#define SRC_ASSERT_HPP_
+
+#include <QtGlobal>
+#include <cstdio>
+#include <cstdlib>
+#include <string>
+#include <cxxabi.h>
+#include <backtrace.h>
+#include <backtrace-supported.h>
+#include <signal.h>
+#include <sys/resource.h>
+
+// --- libbacktrace helpers ---
+static backtrace_state* g_bt_state = nullptr;
+
+static void bt_error_callback(void*, const char* msg, int errnum) {
+    fprintf(stderr, "libbacktrace error: %s (err=%d)\n", msg, errnum);
+}
+
+static int bt_full_callback(void* data,
+                            uintptr_t /*pc*/,
+                            const char* filename,
+                            int lineno,
+                            const char* function) {
+    bool* first_frame = static_cast<bool*>(data);
+
+    // Skip our assert wrapper and ?? frames
+    if (!filename || !function)
+        return 0;
+    if (std::string(filename).find("assert.hpp") != std::string::npos)
+        return 0;
+
+    const char* pretty = function ? function : "??";
+    char* demangled = nullptr;
+    int status = 0;
+    if (function) {
+        demangled = abi::__cxa_demangle(function, nullptr, nullptr, &status);
+        if (status == 0 && demangled)
+            pretty = demangled;
+    }
+
+    fprintf(stderr, "%s %s:%d: %s\n",
+            (*first_frame ? "-->" : "   "),
+            filename,
+            lineno,
+            pretty);
+
+    *first_frame = false;
+    free(demangled);
+    return 0;
+}
+
+inline void print_stacktrace() {
+#ifdef BACKTRACE_SUPPORTED
+    if (!g_bt_state) {
+        g_bt_state = backtrace_create_state(nullptr, 1, bt_error_callback, nullptr);
+    }
+    bool first_frame = true;
+    backtrace_full(g_bt_state, 0, bt_full_callback, bt_error_callback, &first_frame);
+#else
+    fprintf(stderr, "Backtrace not supported on this build.\n");
+#endif
+}
+
+// --- Qt-safe assert with trace ---
+#define Q_ASSERT_WITH_TRACE(cond)                                           \
+    do {                                                                    \
+        if (!(cond)) {                                                      \
+            fprintf(stderr, "ASSERT: \"%s\" in file %s, line %d\n",         \
+                    #cond, __FILE__, __LINE__);                             \
+            print_stacktrace();                                             \
+            fflush(stderr);                                                 \
+            struct rlimit rl{};                                             \
+            rl.rlim_cur = 0;                                                \
+            rl.rlim_max = 0;                                                \
+            setrlimit(RLIMIT_CORE, &rl);                                    \
+            signal(SIGABRT, SIG_DFL);                                       \
+            abort();                                                        \
+        }                                                                   \
+    } while (0)
+
+#endif  // SRC_ASSERT_HPP_