fix misra

and bug if link gets broken original games disappear

Author: noisecode3

.neovim.lua

@@ -81,8 +81,8 @@ end
 require('lint').linters_by_ft = {
   sh = {'shellcheck'}, -- Ensure you have shellcheck installed
   python = {'pylint', 'bandit', 'ruff', 'pydocstyle', 'mypy', 'flake8'}, -- Ensure these are installed
-  cmake = { 'cmakelint' },
-  cpp = {'cppcheck', 'cpplint', 'flawfinder'},
+  cmake = {'cmakelint'},
+  cpp = {'cppcheck', 'cpplint', 'flawfinder', 'clangtidy'},
 }
 
 -- .local/share/nvim/plugged/nvim-lint/lua/lint/linters/cppcheck.lua

src/FileManager.cpp

@@ -58,34 +58,31 @@ inline const QString FileManager::lookGameDir(
     return path;
 }
 
-const QString FileManager::calculateMD5(const QString& file, bool lookGameDir) {
-    const QString path = FileManager::lookGameDir(file, lookGameDir);
+const QString FileManager::calculateMD5(
+        const QString& fileName, bool lookGameDir) {
+    const QString path = FileManager::lookGameDir(fileName, lookGameDir);
     QFileInfo fileInfo(path);
+    QString result;
 
     if (fileInfo.exists() && !fileInfo.isFile()) {
         qDebug() << "Error: The path is not a regular file." << path;
-        return"";
-    }
-
-    QFile f(path);
-    if (!f.open(QIODevice::ReadOnly)) {  // flawfinder: ignore
-        qDebug() << "Error opening file for reading: " << f.errorString();
-        return "";
-    }
-
-    QCryptographicHash md5(QCryptographicHash::Md5);
-
-    std::array<char, 1024> buffer;
-    const int size = buffer.size();
-    int bytesRead;
-
-    // flawfinder: ignore
-    while ((bytesRead = f.read(buffer.data(), size)) > 0) {
-        md5.addData(buffer.data(), bytesRead);
+    } else {
+        QFile file(path);
+        bool status = file.open(QIODevice::ReadOnly);  // flawfinder: ignore
+        if (!status) {
+            qDebug()
+                << "Error opening file for reading: " << file.errorString();
+        } else {
+            QCryptographicHash md5(QCryptographicHash::Md5);
+            if (!md5.addData(&file)) {
+                qWarning() << "Failed to process file for MD5 hash.";
+            } else {
+                result = QString(md5.result().toHex());
+            }
+            file.close();
+        }
     }
-
-    f.close();
-    return QString(md5.result().toHex());
+    return result;
 }
 
 bool FileManager::extractZip(
@@ -195,22 +192,24 @@ bool FileManager::checkFile(const QString& file, bool lookGameDir) {
 }
 
 int FileManager::checkFileInfo(const QString& file, bool lookGameDir) {
+    int status = 0;
     const QString path = FileManager::lookGameDir(file, lookGameDir);
     QFileInfo fileInfo(path);
     if (fileInfo.isDir() == true) {
         qDebug() << "The path is a directory.";
         if (fileInfo.isSymLink() == true) {
             qDebug() << "return value 1:The path is a symbolic link.";
-            return 1;
+            status = 1;
         } else {
             qDebug() << "return value 2:The path is not a symbolic link.";
-            return 2;
+            status = 2;
         }
     } else {
         qDebug() << "value 3:The path is not a directory.";
         qDebug() << "filePath " << path;
-        return 3;
+        status = 3;
     }
+    return status;
 }
 
 bool FileManager::linkGameDir(const QString& levelDir, const QString& gameDir) {

src/FileManager.hpp

@@ -18,6 +18,7 @@
 #include <QObject>
 #include <QFile>
 #include <QDir>
+#include <QByteArray>
 #include <QCryptographicHash>
 #include <QDebug>
 
@@ -35,7 +36,7 @@ class FileManager : public QObject {
     bool extractZip(const QString& zipFile, const QString& extractPath);
     bool checkDir(const QString& file, bool lookGameDir);
     bool checkFile(const QString& file, bool lookGameDir);
-    int checkFileInfo(const QString& file, bool lookGameDir = true);
+    int checkFileInfo(const QString& file, bool lookGameDir);
     qint64 removeFileOrDirectory(const QString &file, bool lookGameDir);
     bool moveFilesToDirectory(
         const QString& fromLevelDirectory,
@@ -70,4 +71,5 @@ class FileManager : public QObject {
     const QString m_sep = QDir::separator();
     Q_DISABLE_COPY(FileManager)
 };
+
 #endif  // SRC_FILEMANAGER_HPP_

src/Model.cpp

@@ -36,14 +36,30 @@ Model::Model() {
 
 Model::~Model() {}
 
-bool Model::setup(const QString& level, const QString& game) {
-    bool status = false;
+void Model::setup(const QString& level, const QString& game) {
     if (setDirectory(level, game) == true) {
-        status = true;
-        emit generateListSignal(checkCommonFiles());
+        QByteArray commonFiles(8, '\0');
+        checkCommonFiles(&commonFiles);
+        m_availableGames.clear();
+        for (int i = 1; i <= 5; i++) {
+            qint8 dirStatus = commonFiles[i];
+            if (dirStatus == 1) {
+                m_availableGames.append(i);
+            } else if (dirStatus == 2) {
+                m_availableGames.append(-i);
+            } else {
+                if (fileManager.checkDir(
+                    QString("/Original.TR%1").arg(i), false) ==  true) {
+                    m_availableGames.append(i);
+                }
+            }
+        }
+        emit generateListSignal(m_availableGames);
         QCoreApplication::processEvents();
+    } else {
+        // send signal to gui with error about setup fail
+        qDebug() << "setDirectory setup failed";
     }
-    return status;
 }
 
 bool Model::setDirectory(const QString& level, const QString& game) {
@@ -56,17 +72,21 @@ bool Model::setDirectory(const QString& level, const QString& game) {
     return status;
 }
 
-const QList<int>& Model::checkCommonFiles() {
-    m_availableGames.clear();
+void Model::checkCommonFiles(QByteArray* games) {
     for (int i = 1; i <= 5; i++) {
         int dirStatus = checkGameDirectory(i);
         if (dirStatus == 1) {  // symbolic link
-            m_availableGames.append(i);
+            m_availableGames.append(1);
         } else if (dirStatus == 2) {  // directory
-            m_availableGames.append(-i);
+            m_availableGames.append(2);
+        } else if (dirStatus == 3) {
+            m_availableGames.append(3);
+            qDebug() << "File could be a broken link or a regular file";
+        } else {
+            m_availableGames.append(0);
+            qDebug() << "File don't exist";
         }
     }
-    return m_availableGames;
 }
 
 QString Model::getGameDirectory(int id) {
@@ -227,25 +247,27 @@ bool Model::getLevelDontHaveFile(
     return status;
 }
 
-bool Model::getLevel(int id) {
+void Model::getLevel(int id) {
     assert(id > 0);
-    bool status = false;
     if (id > 0) {
+        bool status = false;
         ZipData zipData = data.getDownload(id);
         downloader.setUrl(zipData.url);
         downloader.setSaveFile(zipData.name);
+        // this if just slips up execution but has nothing to do with the error
         if (fileManager.checkFile(zipData.name, false)) {
-            qDebug() << "File exists:" << zipData.name;
+            qWarning() << "File exists:" << zipData.name;
             status = getLevelHaveFile(id, zipData.md5sum, zipData.name);
         } else {
-            qWarning() << "File does not exist:" << zipData.name;
+            qDebug() << "File does not exist:" << zipData.name;
             status = getLevelDontHaveFile(id, zipData.md5sum, zipData.name);
         }
         if (status == true) {
-            unpackLevel(id, zipData.name);
+            if (!unpackLevel(id, zipData.name)) {
+                qDebug() << "unpackLevel failed";
+            }
         }
     }
-    return status;
 }
 
 const InfoData Model::getInfo(int id) {

src/Model.hpp

@@ -16,6 +16,7 @@
 
 #include <QObject>
 #include <QMap>
+#include <QBitArray>
 #include <QDebug>
 #include <QtCore>
 #include <cassert>
@@ -55,19 +56,19 @@ class Model : public QObject {
         static Model instance;
         return instance;
     }
-    const QList<int>& checkCommonFiles();
+    void checkCommonFiles(QByteArray* games);
     int checkGameDirectory(int id);
     int checkLevelDirectory(int id);
     void getList(QVector<ListItemData>* list);
     int getItemState(int id);
     bool setLink(int id);
     QString getGameDirectory(int id);
     void setupGame(int id);
-    bool getLevel(int id);
+    void getLevel(int id);
     const InfoData getInfo(int id);
     const QString getWalkthrough(int id);
     bool setDirectory(const QString& level, const QString& game);
-    bool setup(const QString& level, const QString& game);
+    void setup(const QString& level, const QString& game);
 
  signals:
     void generateListSignal(QList<int> availableGames);

src/TombRaiderLinuxLauncher.cpp

@@ -15,7 +15,7 @@
 #include "TombRaiderLinuxLauncher.hpp"
 #include "ui_TombRaiderLinuxLauncher.h"
 #include "staticData.hpp"
-#include "debug.hpp"
+// #include "debug.hpp"
 
 TombRaiderLinuxLauncher::TombRaiderLinuxLauncher(QWidget *parent)
     : QMainWindow(parent) {
@@ -58,7 +58,7 @@ TombRaiderLinuxLauncher::TombRaiderLinuxLauncher(QWidget *parent)
     filter_p->setVisible(false);
 
     connect(ui->filterButton, &QPushButton::clicked,
-        [filter_p, filterButton_p]() {
+        [filter_p, filterButton_p]() -> void {
             bool isVisible = !filter_p->isVisible();
             filter_p->setVisible(isVisible);
 
@@ -114,13 +114,7 @@ TombRaiderLinuxLauncher::TombRaiderLinuxLauncher(QWidget *parent)
 
 void TombRaiderLinuxLauncher::generateList(const QList<int>& availableGames) {
     const QString pictures = ":/pictures/";
-
-    QMap<int, QPair<QString, QString>> fileMap = {
-        {1, {"Tomb_Raider_I.jpg", "I"}},
-        {2, {"Tomb_Raider_II.jpg", "II"}},
-        {3, {"Tomb_Raider_III.jpg", "III"}},
-        {4, {"Tomb_Raider_IIII.jpg", "VI"}},
-        {5, {"Tomb_Raider_IIIII.jpg", "V"}} };
+    OriginalGameData pictueData;
 
     foreach(const int &id, availableGames) {
         // debugStop(QString("%1").arg(id));
@@ -133,9 +127,15 @@ void TombRaiderLinuxLauncher::generateList(const QList<int>& availableGames) {
             linkedGameDir = true;
             IdPositive = id;
         }
-        QString iconPath = pictures + fileMap[IdPositive].first;
+        // debugStop();
+        // Picture and title
+        QString iconPath = pictures + pictueData.getPicture(IdPositive);
         QString itemName =
-            QString("Tomb Raider %1 Original").arg(fileMap[IdPositive].second);
+            QString("Tomb Raider %1 Original")
+                .arg(pictueData.romanNumerals[IdPositive]);
+
+        qDebug() << "iconPath :" << iconPath;
+        qDebug() << "itemName :" << itemName;
         QListWidgetItem *wi = new QListWidgetItem(QIcon(iconPath), itemName);
         wi->setData(Qt::UserRole, QVariant(IdPositive*(-1)));
         wi->setData(Qt::UserRole + 1, QVariant(linkedGameDir));
@@ -344,8 +344,8 @@ void TombRaiderLinuxLauncher::originalSelected(QListWidgetItem *selectedItem) {
     if (selectedItem != nullptr) {
         int id = selectedItem->data(Qt::UserRole).toInt();
         bool linkedGameDir = selectedItem->data(Qt::UserRole + 1).toBool();
-        // the game dirr was a symbolic link and it has a level dir
-        if (linkedGameDir == true && controller.getItemState(id) == 1) {
+        // the game directory was a symbolic link and it has a level directory
+        if ((linkedGameDir == true) && (controller.getItemState(id) == 1)) {
             ui->pushButtonLink->setEnabled(true);
             ui->pushButtonDownload->setEnabled(false);
         } else {

src/TombRaiderLinuxLauncher.hpp

@@ -145,4 +145,23 @@ class TombRaiderLinuxLauncher : public QMainWindow {
     QSettings m_settings;
     Ui::TombRaiderLinuxLauncher *ui;
 };
+
+struct OriginalGameData {
+    QMap<int, QString> romanNumerals = {
+            {0, "null"},
+            {1, "I"},
+            {2, "II"},
+            {3, "III"},
+            {4, "IV"},
+            {5, "V"},
+            {6, "VI"},
+            {7, "IUB"},
+            {8, "IIGM"},
+            {9, "IIILM"},
+    };
+    const QString getPicture(int id) {
+        return QString ("Tomb_Raider_%1.jpg").arg(romanNumerals[id]);
+    }
+};
+
 #endif  // SRC_TOMBRAIDERLINUXLAUNCHER_HPP_

src/pictures/Tomb_Raider_IIII.jpg src/pictures/Tomb_Raider_IV.jpgsrc/pictures/Tomb_Raider_IIII.jpg renamed to src/pictures/Tomb_Raider_IV.jpg

@@ -8,8 +8,8 @@
     <file>pictures/Tomb_Raider_I.jpg</file>
     <file>pictures/Tomb_Raider_II.jpg</file>
     <file>pictures/Tomb_Raider_III.jpg</file>
-    <file>pictures/Tomb_Raider_IIII.jpg</file>
-    <file>pictures/Tomb_Raider_IIIII.jpg</file>
+    <file>pictures/Tomb_Raider_IV.jpg</file>
+    <file>pictures/Tomb_Raider_V.jpg</file>
     <file>pictures/Tomb_Raider_III_LA.jpg</file>
     <file>pictures/Tomb_Raider_III_unkown.jpg</file>
   </qresource>