add GameFileTree

noisecode3 · noisecode3 · commit d70cabace49b · 2025-01-14T00:53:30.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,8 @@ set(SOURCES_TESTS
 set(SOURCES_MC
     src/main.cpp
     src/binary.hpp
-    src/gameTree.hpp
+    src/GameFileTree.hpp
+    src/GameFileTree.cpp
     src/staticData.hpp
     src/Network.hpp
     src/Network.cpp
diff --git a/src/Data.cpp b/src/Data.cpp
@@ -240,7 +240,7 @@ QVector<FileList> Data::getFileList(const int id) {
     query.bindValue(":id", id);
 
     if (query.exec() == true) {
-        while (query.next()) {
+        while (query.next() == true) {
             list.append({
                 query.value("path").toString(),
                 query.value("md5sum").toString()});
diff --git a/src/FileManager.cpp b/src/FileManager.cpp
@@ -20,7 +20,7 @@
 #include <QtCore>
 #include <QByteArray>
 #include <QDataStream>
-#include "gameTree.hpp"
+#include "GameFileTree.hpp"
 #include "miniz.h"
 #include "miniz_zip.h"
 
@@ -88,6 +88,7 @@ const QString FileManager::calculateMD5(
 bool FileManager::extractZip(
     const QString& zipFilename,
     const QString& outputFolder) {
+    bool status = false;
     const QString& zipPath =
         QString("%1%2%3").arg(m_levelDir.absolutePath(), m_sep, zipFilename);
     const QString& outputPath =
@@ -103,77 +104,72 @@ bool FileManager::extractZip(
 
     // Open the zip file
     mz_zip_archive zip;
-    memset(&zip, 0, sizeof(zip));
-    mz_bool result =
-        mz_zip_reader_init_file(&zip, zipPath.toUtf8().constData(), 0);
-    if (!result) {
-        qWarning() << "Failed to open zip file" << zipPath;
-        return false;
-    }
-
-    // Extract each file in the zip archive
-    mz_uint numFiles = mz_zip_reader_get_num_files(&zip);
-    qDebug() << "Zip file contains" << numFiles << "files";
-
-    unsigned int gotoPercent = 50;  // Percentage of total work
-    unsigned int lastPrintedPercent = 0;  // Last printed percentage
-
-    for (uint i = 0; i < numFiles; i++) {
-        mz_zip_archive_file_stat file_stat;
-        if (!mz_zip_reader_file_stat(&zip, i, &file_stat)) {
-            qWarning() << "Failed to get file info for file" << i
-            << "in zip file" << zipPath;
-            mz_zip_reader_end(&zip);
-            return false;
-        }
+    (void)memset(&zip, 0, sizeof(zip));
+    if (mz_zip_reader_init_file(
+        &zip, zipPath.toUtf8().constData(), 0) == true) {
+        // Extract each file in the zip archive
+        quint64 numFiles = mz_zip_reader_get_num_files(&zip);
+        qDebug() << "Zip file contains" << numFiles << "files";
+
+        quint64 gotoPercent = 50;  // Percentage of total work
+        quint64 lastPrintedPercent = 0;  // Last printed percentage
+
+        for (quint64 i = 0; i < numFiles; i++) {
+            mz_zip_archive_file_stat file_stat;
+            if (!mz_zip_reader_file_stat(&zip, i, &file_stat)) {
+                qWarning() << "Failed to get file info for file" << i
+                << "in zip file" << zipPath;
+                mz_zip_reader_end(&zip);
+                break;
+            }
 
-        QString filename = QString::fromUtf8(file_stat.m_filename);
-        if (filename.endsWith('/') == true) {
-            continue;  // Skip directories
-        }
+            QString filename = QString::fromUtf8(file_stat.m_filename);
+            if (filename.endsWith('/') == true) {
+                continue;  // Skip directories
+            }
 
-        QString outFile = outputPath + "/" + filename;
-        qDebug() << "Extracting" << filename;
+            QString outFile = QString("%1/%2").arg(outputPath, filename);
+            qDebug() << "Extracting" << filename;
 
-        if (!QDir().mkpath(QFileInfo(outFile).path())) {
-            qWarning() << "Failed to create directory for file" << outFile;
-            mz_zip_reader_end(&zip);
-            return false;
-        }
-
-        if (!mz_zip_reader_extract_to_file(
-                &zip,
-                i,
-                outFile.toUtf8().constData(),
-                0)) {
-            qWarning() << "Failed to extract file" << filename
-                    << "from zip file" << zipPath;
-            mz_zip_reader_end(&zip);
-            return false;
-        }
+            if (!QDir().mkpath(QFileInfo(outFile).path())) {
+                qWarning() << "Failed to create directory for file" << outFile;
+                mz_zip_reader_end(&zip);
+                break;
+            }
 
-        unsigned int currentPercent = ((i + 1) * gotoPercent) / numFiles;
+            if (!mz_zip_reader_extract_to_file(
+                    &zip,
+                    i,
+                    outFile.toUtf8().constData(),
+                    0)) {
+                qWarning() << "Failed to extract file" << filename
+                        << "from zip file" << zipPath;
+                mz_zip_reader_end(&zip);
+                break;
+            }
 
-        if (currentPercent != lastPrintedPercent) {
-            for (unsigned int j = lastPrintedPercent + 1;
-                            j <= currentPercent; j++) {
-                emit this->fileWorkTickSignal();
-                QCoreApplication::processEvents();
+            quint64 currentPercent =
+                ((i + quint64(1)) * gotoPercent) / numFiles;
+
+            if (currentPercent != lastPrintedPercent) {
+                for (quint64 j = lastPrintedPercent + quint64(1);
+                                j <= currentPercent; j++) {
+                    emit this->fileWorkTickSignal();
+                    QCoreApplication::processEvents();
+                }
+                lastPrintedPercent = currentPercent;
+                if (currentPercent == gotoPercent) {
+                    status = true;
+                }
             }
-            lastPrintedPercent = currentPercent;
         }
+    } else {
+        qWarning() << "Failed to open zip file" << zipPath;
     }
-
-    // Ensure any remaining progress is emitted
-    for (unsigned int j = lastPrintedPercent + 1; j <= gotoPercent; j++) {
-        emit this->fileWorkTickSignal();
-        QCoreApplication::processEvents();
-    }
-
     // Clean up
     mz_zip_reader_end(&zip);
     qDebug() << "Unzip complete";
-    return true;
+    return status;
 }
 
 /**
@@ -219,15 +215,17 @@ bool FileManager::linkGameDir(const QString& levelDir, const QString& gameDir) {
     const QString gamePath =  QString("%1%2")
         .arg(m_gameDir.absolutePath(), gameDir);
 
-    test(levelPath);  // here we just output the directory tree for now..
+    QDir dir(levelPath);
+    GameFileTree test(dir);
+    test.printTree(1);
 
     if (QFile::link(levelPath, gamePath) == true) {
         qDebug() << "Symbolic link created successfully.";
         status = true;
     } else {
         QFileInfo fileInfo(gamePath);
         if (fileInfo.isSymLink() == true) {
-            QFile::remove(gamePath);
+            (void)QFile::remove(gamePath);
             if (QFile::link(levelPath, gamePath) == true) {
                 qDebug() << "Symbolic link created successfully.";
                 status = true;
@@ -261,7 +259,7 @@ bool FileManager::makeRelativeLink(
     } else {
         QFileInfo i(toPath);
         if (i.isSymLink() == true) {
-            QFile::remove(toPath);
+            (void)QFile::remove(toPath);
             if (QFile::link(fromPath, toPath) == true) {
                 qDebug() << "Symbolic link created successfully.";
                 status = true;
@@ -419,10 +417,10 @@ bool FileManager::moveFilesToDirectory(
         dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
 
     // Move files and recursively move directories
-    bool allMoved = std::all_of(
+    return std::all_of(
             entryFileList.cbegin(),
             entryFileList.cend(),
-            [&](const QString& entry) {
+            [&](const QString& entry) -> bool {
         bool status = true;
 
         QString entryPath = QString("%1%2%3")
@@ -435,10 +433,9 @@ bool FileManager::moveFilesToDirectory(
                 << entryPath << "to:" << destinationPath;
             status = false;
         }
-
+        // cppcheck-suppress misra-c2012-15.5
         return status;
     });
-    return allMoved;
 }
 
 bool FileManager::moveFilesToParentDirectory(
diff --git a/src/GameFileTree.cpp b/src/GameFileTree.cpp
@@ -0,0 +1,133 @@
+/* TombRaiderLinuxLauncher
+ * Martin Bångens Copyright (C) 2024
+ * 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.
+ */
+
+/* An GameFileTree object can contain
+ * one tree of game files and can match another whole tree or branch.
+ * It can print out the tree or a specific branch by index.
+ * This object it used to recognise game files from TRLE's or
+ * any distribution of the original Tomb Raider Games
+ * a tree pattern can be matched from "root or branch"
+ * This mean we have default tree objects to match with
+ * like how we know if there is an exe file and ./data + ./audio
+ * from there we can link to the correct game directory for the
+ * launcher. We also do binary recognition for the Tomb Raider exe
+ * and maybe other files. We compare/match and verify game files here.
+ */
+
+#include "GameFileTree.hpp"
+#include <QDir>
+#include <QFileInfo>
+#include <QQueue>
+#include <QTextStream>
+
+GameFileTree::GameFileTree(
+        const QString &fileName, GameFileTree *parent)
+    // cppcheck-suppress misra-c2012-12.3
+    : m_fileName(fileName), m_parentItem(parent)
+{}
+
+GameFileTree::~GameFileTree() {
+    for (GameFileTree* child : m_childItems) {
+        delete child;
+    }
+}
+
+
+GameFileTree::GameFileTree(const QString& fileList) : m_parentItem(nullptr) {
+    QStringList pathList = fileList.split("\n");
+    addPathList(pathList);
+}
+
+GameFileTree::GameFileTree(const QDir &dir) : m_parentItem(nullptr) {
+    if (dir.exists() == true) {
+        QStringList pathList;
+        // Skapa en kö för att hantera kataloger iterativt
+        QQueue<QString> dirQueue;
+        dirQueue.enqueue(dir.absolutePath());
+
+        while (!dirQueue.isEmpty()) {
+            QString currentDirPath = dirQueue.dequeue();
+            QDir currentDir(currentDirPath);
+
+            // Hämta alla filer och mappar i den aktuella katalogen
+            QFileInfoList fileList = currentDir.entryInfoList(
+                QDir::Files |
+                QDir::Dirs |
+                QDir::NoDotAndDotDot |
+                QDir::Hidden,
+                QDir::Name);
+
+            for (const QFileInfo& fileInfo : fileList) {
+                pathList << fileInfo.absoluteFilePath();
+
+                // Om objektet är en katalog, lägg till den i kön
+                if (fileInfo.isDir() == true) {
+                    dirQueue.enqueue(fileInfo.absoluteFilePath());
+                }
+            }
+        }
+        addPathList(pathList);
+    } else {
+        QTextStream(stdout) << "Directory does not exist: "
+            << dir.absolutePath() << Qt::endl;
+    }
+}
+
+void GameFileTree::addPathList(const QStringList& pathList) {
+    for (const QString& path : pathList) {
+        QStringList components = QDir::toNativeSeparators(path).split(QDir::separator(), Qt::SkipEmptyParts);
+        GameFileTree* current = this;
+
+        for (const QString& component : components) {
+            // Check if a child node with this name already exists
+            auto it = std::find_if(current->m_childItems.begin(), current->m_childItems.end(),
+                                   [&component](GameFileTree* child) {
+                                       return child->m_fileName == component;
+                                   });
+
+            if (it == current->m_childItems.end()) {
+                // Node doesn't exist, create it
+                GameFileTree* newNode = new GameFileTree(component, current);
+                current->m_childItems.append(newNode);
+                current = newNode;
+            } else {
+                // Move to the existing node
+                current = *it;
+            }
+        }
+    }
+}
+
+
+void GameFileTree::printTree(int level) const {
+    // Build the current node's path by traversing up to the root
+    QString fullPath;
+    const GameFileTree* currentNode = this;
+
+    while (currentNode != nullptr) {
+        if (!currentNode->m_fileName.isEmpty()) {
+            fullPath = currentNode->m_fileName + QDir::separator() + fullPath;
+        }
+        currentNode = currentNode->m_parentItem;
+    }
+
+    // Print the full path for this node
+    QTextStream(stdout) << fullPath << Qt::endl;
+
+    // Recursively call printTree on all child nodes
+    for (const GameFileTree* child : m_childItems) {
+        if (child != nullptr) {
+            child->printTree(level + 1);
+        }
+    }
+}
diff --git a/src/GameFileTree.hpp b/src/GameFileTree.hpp
@@ -0,0 +1,41 @@
+/* TombRaiderLinuxLauncher
+ * Martin Bångens Copyright (C) 2024
+ * 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_GAMEFILETREE_HPP_
+#define SRC_GAMEFILETREE_HPP_
+
+#include <QString>
+#include <QVector>
+#include <QDir>
+#include <QStringList>
+#include <QDebug>
+
+class GameFileTree {
+ public:
+    explicit GameFileTree(const QDir& fullPath);
+    explicit GameFileTree(const QString& fileList);
+    ~GameFileTree();
+
+    void printTree(int level) const;
+
+ private:
+    explicit GameFileTree(
+        const QString &fileName, GameFileTree *parentItem);
+    void addPathList(const QStringList& pathList);
+    void addNode(GameFileTree* node);  // maybe dont need this
+    QVector<GameFileTree*> m_childItems;
+    QString m_fileName;
+    GameFileTree *m_parentItem;
+};
+
+#endif  // SRC_GAMEFILETREE_HPP_
diff --git a/src/Model.cpp b/src/Model.cpp
diff --git a/src/gameTree.hpp b/src/gameTree.hpp
