Fix and hug all trees (#2)

* use type for GameFileTree

* clean-up some down the memory lane

* use QSet<QString> for child names on every node besides Qlist for child pointers

* fix subDir matching

* make first test

* test work

it fail still when an zip file have multiple executables

* fix levelListProxy index bug, and multiple patterns tree bug

* fix relative link to executable

* setup nvim lsp better

* fix codacy explicit warning

Author: noisecode3

CMakeLists.txt

@@ -113,6 +113,8 @@ set(SOURCES_MC
     src/Controller.cpp
     src/Data.hpp
     src/Data.cpp
+    src/Dialog.hpp
+    src/Dialog.cpp
     src/FileManager.hpp
     src/FileManager.cpp
     src/GameFileTree.hpp
@@ -134,6 +136,7 @@ set(SOURCES_MC
     src/assert.hpp
     src/binary.hpp
     src/binary.cpp
+    src/gameFileTreeData.hpp
     src/main.cpp
     src/staticData.hpp
 )

README.md

@@ -27,10 +27,10 @@ Ensure the following are installed on your Linux desktop:
 
 - `curl` (7.71.0 or newer)
 - `OpenSSL`
-- `Qt5`
+- `Qt6`
 
 ```shell
-sudo pacman -S qt5-wayland qt5-webengine qt5-imageformats
+sudo pacman -S qt6-wayland qt6-webengine qt6-imageformats
 ```
 
 ### Build

setup_nvim_lsp.sh

@@ -18,3 +18,7 @@ git config submodule.libs/miniz.ignore all
 git config submodule.libs/libbacktrace.ignore all
 
 ./build.sh
+
+#clangd complain
+cp build/compile_commands.json compile_commands.json
+sed -i 's/-mno-direct-extern-access[ ]*//g' compile_commands.json

src/Data.cpp

@@ -225,6 +225,7 @@ ZipData Data::getDownload(const int id) {
                 result.setURL(query.value("Zip.url").toString());
                 result.setVersion(query.value("Zip.version").toInt());
                 result.setType(query.value("Info.type").toInt());
+                result.setId(id);
                 result.setRelease(query.value("Zip.release").toString());
             } else {
                 qDebug() << "No results found for Level ID:" << id;

src/Data.hpp

@@ -198,18 +198,26 @@ struct ZipData {
      * @brief This sets the zip file name metadata.
      * @param version File version from trcustoms.org
      */
-    inline void setVersion(const qint64 version) {
+    inline void setVersion(const quint64 version) {
         m_version = version;
     }
 
     /**
-     * @brief This sets the zip file name metadata.
+     * @brief This sets the level type metadata.
      * @param type Level type.
      */
-    inline void setType(const qint64 type) {
+    inline void setType(const quint64 type) {
         m_type = type;
     }
 
+    /**
+     * @brief This sets the id metadata.
+     * @param type Level is.
+     */
+    inline void setId(const quint64 id) {
+        m_id = id;
+    }
+
     /**
      * @brief This sets the zip file name metadata.
      * @param release date of file release.
@@ -222,8 +230,10 @@ struct ZipData {
     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.
+    quint64 m_version;     ///< The Version of trcustoms archive file.
+    quint64 m_type;        ///< The TRLE type used to identify a executable.
+    quint64 m_id;          ///< The Level id.
+    QString m_host;        ///< The host TRLE or TRCUSTOMS.
     QString m_release;     ///< The The date of file release from trcustoms.
 };
 

src/Dialog.cpp

@@ -0,0 +1,65 @@
+/* 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.
+ */
+
+#include "../src/Dialog.hpp"
+
+
+Dialog::Dialog(QWidget *parent)
+    : QWidget(parent),
+      m_layout(new QVBoxLayout(this)),
+      m_label(new QLabel(this)),
+      m_optionContainer(new QWidget(this)),
+      m_optionLayout(new QVBoxLayout(m_optionContainer)),
+      m_buttonGroup(new QButtonGroup(this)),
+      m_okButton(new QPushButton("OK", this))
+{
+    m_layout->addWidget(m_label);
+    m_layout->addWidget(m_optionContainer);
+    m_layout->addWidget(m_okButton);
+
+    connect(m_okButton, &QPushButton::clicked, this, [this]() {
+        emit okClicked();
+    });
+}
+
+void Dialog::setMessage(const QString &text) {
+    m_label->setText(text);
+}
+
+void Dialog::setOptions(const QStringList &options) {
+    // Clear old options
+    qDeleteAll(m_buttonGroup->buttons());
+    QLayoutItem *child;
+    while ((child = m_optionLayout->takeAt(0)) != nullptr) {
+        delete child->widget();
+        delete child;
+    }
+
+    if (options.isEmpty()) {
+        m_optionContainer->hide();
+        return;
+    }
+
+    m_optionContainer->show();
+    for (const QString &opt : options) {
+        QRadioButton *rb = new QRadioButton(opt);
+        m_buttonGroup->addButton(rb);
+        m_optionLayout->addWidget(rb);
+    }
+}
+
+QString Dialog::selectedOption() const {
+    auto btn = m_buttonGroup->checkedButton();
+    return btn ? btn->text() : QString();
+}
+

src/Dialog.hpp

@@ -0,0 +1,45 @@
+/* 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_DIALOG_HPP_
+#define SRC_DIALOG_HPP_
+
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QButtonGroup>
+#include <QWidget>
+
+class Dialog : public QWidget {
+    Q_OBJECT
+
+ public:
+    explicit Dialog(QWidget* parent);
+    void setMessage(const QString &text);
+    void setOptions(const QStringList &options);
+    QString selectedOption() const;
+
+ signals:
+    void okClicked();
+
+ private:
+    QVBoxLayout* m_layout;
+    QLabel* m_label;
+    QWidget* m_optionContainer;
+    QVBoxLayout* m_optionLayout;
+    QButtonGroup* m_buttonGroup;
+    QPushButton* m_okButton;
+};
+
+#endif  // SRC_DIALOG_HPP_