Add Path

Author: noisecode3

CMakeLists.txt

@@ -95,6 +95,8 @@ set(SOURCES_MC
     src/Model.cpp
     src/Network.hpp
     src/Network.cpp
+    src/Path.cpp
+    src/Path.hpp
     src/PyRunner.cpp
     src/PyRunner.hpp
     src/Runner.cpp

README.md

@@ -6,8 +6,8 @@ This project is my passion for Tomb Raider classics combined with learning C++,
 
 ## Features
 
-- Run level wine/proton from app
-- Search trle.net with a fast offline indexing
+- Run level with Wine/Proton from app
+- Search trle.net with fast offline indexing
 - Lazy loading trle.net level info (runtime scraping)
 - Integrates with Linux other launchers (Steam, Lutris, etc.)
 - Controller mapper support using uinput
@@ -148,7 +148,7 @@ sudo modprobe ntsync
 
 ```
 
-I listed some open source modes that work well with proton/wine.
+I listed some open source modes that work well with Proton/Wine.
 
 ### TR1
 

src/Data.cpp

@@ -267,9 +267,9 @@ void Data::setDownloadMd5(const int id, const QString& newMd5sum) {
     }
 }
 
-QVector<File> Data::getFileList(const int id) {
+QVector<FileListItem> Data::getFileList(const int id) {
     QSqlQuery query(db);
-    QVector<File> list;
+    QVector<FileListItem> list;
 
     if (!query.prepare(
             "SELECT File.path, File.md5sum "

src/Data.hpp

@@ -25,13 +25,12 @@
 #include <QSqlError>
 #include <QSqlQuery>
 
-
 /**
- * @struct File
+ * @struct FileListItem
  * @brief Files object to keep track of files.
  *
  */
-struct File {
+struct FileListItem {
     QString path;
     QString md5sum;
 };
@@ -459,28 +458,33 @@ class Data : public QObject {
      * @return The number of Level records
      */
     qint64 getListRowCount();
+
     /**
      * @brief Get the main list of levels, without the picture
      * @return The QVector ListItemData is all the level metadata
      */
     QVector<ListItemData> getListItems();
+
     /**
      * @brief Add Cover Pictures to ListItemData pointers
      * @param Cache like used QVector for holding ListItemData pointers
      */
     void getCoverPictures(QVector<ListItemData*>* items);
+
     /**
      * @brief Get the info page, this is HTML and picture data you see on trel.net
      * @param trle.net lid
      * @return The InfoData is a struct of QString and QVector<QPixmap>
      */
     InfoData getInfo(int id);
+
     /**
      * @brief Get the walkthrough HTML page
      * @param trle.net lid
      * @return HTML and Qt picture data
      */
     QString getWalkthrough(int id);
+
     /**
      * @brief Get the type of a level
      * @param trle.net lid
@@ -493,13 +497,15 @@ class Data : public QObject {
      * @param Id number for original game
      * @return File vector list (path and md5sum)
      */
-    QVector<File> getFileList(const int id);
+    QVector<FileListItem> getFileList(const int id);
+
     /**
      * @brief Get download info for a level
      * @param trle.net lid
      * @return zip data, url, filename, size, etc...
      */
     ZipData getDownload(const int id);
+
     /**
      * @brief Record new md5sum to database.
      * @param trle.net lid

src/File.cpp

@@ -24,6 +24,7 @@
 #include "../miniz/miniz_zip.h"
 #include "../src/gameFileTreeData.hpp"
 #include "../src/binary.hpp"
+#include "../src/Path.hpp"
 
 bool FileManager::backupGameDir(const QString &gameDir) {
     bool status = false;
@@ -68,17 +69,6 @@ const QString FileManager::calculateMD5(
     return result;
 }
 
-bool FileManager::checkDir(const QString& file, bool lookGameDir) {
-    const QString path = FileManager::getFullPath(file, lookGameDir);
-    QDir directory(path);
-    return directory.exists();
-}
-
-bool FileManager::checkFile(const QString& file, bool lookGameDir) {
-    const QString path = FileManager::getFullPath(file, lookGameDir);
-    QFile fFile(path);
-    return fFile.exists();
-}
 
 int FileManager::checkFileInfo(const QString& file, bool lookGameDir) {
     int status = 0;

src/File.hpp

@@ -21,6 +21,7 @@
 #include <QByteArray>
 #include <QCryptographicHash>
 #include <QDebug>
+#include "../src/Path.hpp"
 
 class FileManager : public QObject {
     Q_OBJECT
@@ -61,38 +62,6 @@ class FileManager : public QObject {
      */
     const QString calculateMD5(const QString& file, bool lookGameDir);
 
-    /**
-     * @brief Checks if a given directory exists.
-     *
-     * This function constructs the full path of a directory based on the given
-     * filename and the specified directory type (game directory or level directory).
-     * It then verifies whether the directory exists.
-     *
-     * @param file The name of the directory to check.
-     * @param lookGameDir If `true`, the directory is checked in the game directory;
-     *                    otherwise, it is checked in the level directory.
-     * @return `true` if the directory exists, otherwise `false`.
-     *
-     * @note This function does not check if the path is actually a directory.
-     */
-    bool checkDir(const QString& file, bool lookGameDir);
-
-    /**
-     * @brief Checks if a given file exists.
-     *
-     * This function constructs the full path of a file based on the given filename
-     * and the specified directory type (game directory or level directory).
-     * It then verifies whether the file exists.
-     *
-     * @param file The name of the file to check.
-     * @param lookGameDir If `true`, the file is checked in the game directory;
-     *                    otherwise, it is checked in the level directory.
-     * @return `true` if the file exists, otherwise `false`.
-     *
-     * @note This function does not check if the path is a regular file.
-     */
-    bool checkFile(const QString& file, bool lookGameDir);
-
     /**
      * @brief Checks the type of a file path and returns a status code.
      *

src/FileManager.cpp

@@ -12,16 +12,21 @@
  */
 
 #include "../src/Model.hpp"
+#include "../src/Data.hpp"
+#include "../src/Path.hpp"
 
 Model::Model() {}
 Model::~Model() {}
 
 bool Model::setupDirectories(const QString& level, const QString& game) {
     bool status = false;
+
     if (fileManager.setUpCamp(level, game) &&
             downloader.setUpCamp(level) &&
             data.initializeDatabase(level) &&
             m_pyRunner.setUpCamp(level)) {
+        Path::setProgramFilesPath();
+        Path::setResourcePath();
         status = true;
     }
     return status;
@@ -34,8 +39,10 @@ void Model::setup(const QString& level, const QString& game) {
         // Iterate backward to avoid index shifting
         for (int i = 4; i >= 0; i--) {
             int dirStatus = commonFiles[i];
-            if (fileManager.checkDir(
-                QString("/Original.TR%1").arg(i + 1), false) == true) {
+
+            Path p(Path::resource);
+            p << QString("Original.TR%1").arg(i + 1);
+            if (p.isDir()) {
                 commonFiles[i] = i + 1;
             } else if (dirStatus == 2) {
                 commonFiles[i] = -(i + 1);
@@ -111,16 +118,19 @@ void Model::getCoverList(QVector<ListItemData*>* items) {
 
 int Model::getItemState(int id) {
     int status = 0;
+
+    Path path(Path::resource);
     if (id < 0) {
-        QString dir = QString("Original.TR%1").arg(id);
-        if (fileManager.checkDir(dir, false)) {
+        path << QString("Original.TR%1").arg(id);
+        if (path.isDir()) {
             status = 2;
         } else {
             status = 1;
         }
     } else if (id > 0) {
-        QString dir = QString("%1.TRLE").arg(id);
-        if (fileManager.checkDir(dir, false)) {
+        path << QString("%1.TRLE").arg(id);
+        qDebug() << "getItemState: path is " << path.get();
+        if (path.isDir()) {
             status = 2;
         } else {
             status = 0;
@@ -175,8 +185,8 @@ bool Model::runUmu(const int id) {
 }
 
 
-void Model::setUmuEnv(const QVector<QPair<QString, QString>>& env) {
-    for (const QPair<QString, QString>& e : env) {
+void Model::setUmuEnv(const QVector<QPair<QString, QString>>& environment) {
+    for (const QPair<QString, QString>& e : environment) {
         m_umuRunner.insertProcessEnvironment(e);
     }
 }
@@ -224,8 +234,8 @@ bool Model::runWine(const qint64 id) {
     return status;
 }
 
-void Model::setWineEnv(const QVector<QPair<QString, QString>>& env) {
-    for (const QPair<QString, QString>& e : env) {
+void Model::setWineEnv(const QVector<QPair<QString, QString>>& environment) {
+    for (const QPair<QString, QString>& e : environment) {
         m_wineRunner.insertProcessEnvironment(e);
     }
 }
@@ -236,19 +246,22 @@ void Model::setWineSetup() {
 
 bool Model::setLink(int id) {
     bool status = false;
+    Path path(Path::resource);
     if (id < 0) {  // we use original game id as negative number
         int orgId = (-1)*id;
-        const QString s = QString("/Original.TR%1").arg(orgId);
-        if (fileManager.checkDir(s, false )) {
+        path << QString("Original.TR%1").arg(orgId);
+        const QString s = path.get();
+        if (path.isDir()) {
             status = fileManager.linkGameDir(s, getGameDirectory(orgId));
         } else {
             qDebug() << "Dirr: " << s << " seems to bee missing";
         }
     } else {
-        const QString s = QString("/%1.TRLE").arg(id);
+        path << QString("%1.TRLE").arg(id);
+        const QString s = path.get();
         const int t = data.getType(id);
 
-        if (fileManager.checkDir(s, false )) {
+        if (path.isDir()) {
             status = fileManager.linkGameDir(s, getGameDirectory(t));
         } else {
             qDebug() << "Dirr: " << s << " seems to bee missing";
@@ -258,7 +271,7 @@ bool Model::setLink(int id) {
 }
 
 void Model::setupGame(int id) {
-    QVector<File> list = data.getFileList(id);
+    QVector<FileListItem> list = data.getFileList(id);
     const size_t s = list.size();
     assert(s != (unsigned int)0);
 
@@ -363,7 +376,11 @@ void Model::getLevel(int id) {
         downloader.setUrl(zipData.m_URL);
         downloader.setSaveFile(zipData.m_fileName);
         // this if just slips up execution but has nothing to do with the error
-        if (fileManager.checkFile(zipData.m_fileName, false)) {
+
+        Path path(Path::resource);
+        path << zipData.m_fileName;
+
+        if (path.isFile()) {
             qWarning() << "File exists:" << zipData.m_fileName;
             status = getLevelHaveFile(id, zipData.m_MD5sum, zipData.m_fileName);
         } else {

src/FileManager.hpp

@@ -23,6 +23,7 @@
 
 #include <cassert>
 
+#include "../src/Path.hpp"
 #include "../src/Data.hpp"
 #include "../src/FileManager.hpp"
 #include "../src/Network.hpp"
@@ -68,10 +69,10 @@ class Model : public QObject {
     void getCoverList(QVector<ListItemData*>* tiems);
     int getItemState(int id);
     bool runUmu(const int id);
-    void setUmuEnv(const QVector<QPair<QString, QString>>& env);
+    void setUmuEnv(const QVector<QPair<QString, QString>>& environment);
     void setUmuSetup();
     bool runWine(const qint64 id);
-    void setWineEnv(const QVector<QPair<QString, QString>>& env);
+    void setWineEnv(const QVector<QPair<QString, QString>>& environment);
     void setWineSetup();
     bool runLutris(const QStringList& arg);
     bool runSteam(const int id);