fix setup toggle and use Path instead of setupDirectories

Author: noisecode3

README.md

@@ -119,15 +119,13 @@ compile with cmake -DTEST=on
 ./TombRaiderLinuxLauncherTest -w tomb4.exe
 ```
 
-I was going to mix trle.net with trcustoms.org data, I have not made contacted with the site owner
-to ask if I can use the site for scraping for non commercial use. As this task turned out to be
-harder than I thought, to match data without creating doubles, I'm gonna wait until the basics
-and trle.net part is implemented.
+I was going to mix trle.net with trcustoms.org data, I have not made contacted with the site owner to ask if I can use the site for scraping for non commercial use. As this task turned out to be harder than I thought, to match data without creating doubles, I'm gonna wait until the basics and trle.net part is implemented.
 
 ## Screenshots
 
 ![screenshot1](https://raw.githubusercontent.com/noisecode3/TombRaiderLinuxLauncher/main/doc/screenshot1.jpg)
-![screenshot1](https://raw.githubusercontent.com/noisecode3/TombRaiderLinuxLauncher/main/doc/screenshot2.jpg)
+![screenshot2](https://raw.githubusercontent.com/noisecode3/TombRaiderLinuxLauncher/main/doc/screenshot2.jpg)
+![screenshot3](https://raw.githubusercontent.com/noisecode3/TombRaiderLinuxLauncher/main/doc/screenshot3.jpg)
 
 ## Guide
 
@@ -141,8 +139,7 @@ I tested the original, unpatched Tomb Raider III on an i7-4800MQ using its integ
 WINEPREFIX="/home/noisecode3/.newtombprefix" PROTONPATH="/home/noisecode3/.steam/steam/compatibilitytools.d/GE-Proton10-10" GAMEID="225320" MESA_SHADER_CACHE="true"
 ```
 
-It ran nearly perfectly — only a tiny framedrop once per hour, or sometimes not at all. Timing jitter caused by Wine’s threading system is largely eliminated under NTSync.
-NTSync can help DDraw, DirectSound other I/O thread workers in wine. On Arch Linux (or other distros with a modular kernel), you’ll need to manually load the ntsync driver to enable proper synchronization support:
+It ran nearly perfectly — only a tiny framedrop once per hour, or sometimes not at all. Timing jitter caused by Wine’s threading system is largely eliminated under NTSync. NTSync can help DDraw, DirectSound other I/O thread workers in wine. On Arch Linux (or other distros with a modular kernel), you’ll need to manually load the ntsync driver to enable proper synchronization support:
 
 ```shell
 sudo modprobe ntsync
@@ -173,9 +170,8 @@ I listed some open source modes that work well with Proton/Wine.
 
 ## Targets
 
-I program mostly on Slackware-current and Arch, I gonna try target and test SteamOS for second release.
-I don't use Windows but it should build on both Windows and Linux with MinGw.
-It's recommended as a standard to use Arch Linux or MSYS2 on Windows, with qt-creator.
+I program mostly on Slackware-current and Arch, I gonna try target and test SteamOS for second release. I don't use Windows but it should build on both Windows and Linux with MinGw. It's recommended as a standard to use Arch Linux or MSYS2 on Windows, with qt-creator. I use neovim and qt-creator at the same time. You can have qt-creator open and configured to build in build/Desktop-Debug while you have neovim using the build directory. I find qt-creator useful for its debugger.
+![screenshot4](https://raw.githubusercontent.com/noisecode3/TombRaiderLinuxLauncher/main/doc/screenshot4.jpg)
 
 ## License
 

doc/screenshot3.jpg

@@ -73,8 +73,8 @@ void Controller::runOnThreadB(std::function<void()> func) {
 }
 
 // Threaded work
-void Controller::setup(const QString& level, const QString& game) {
-    runOnThreadA([=]() { model.setup(level, game); });
+void Controller::setup() {
+    runOnThreadA([=]() { model.setup(); });
 }
 
 void Controller::setupGame(int id) {

doc/screenshot4.jpg

@@ -31,7 +31,7 @@ class Controller : public QObject {
         return instance;
     }
 
-    void setup(const QString& level, const QString& game);
+    void setup();
     void setupGame(int id);
     void setupLevel(int id);
     void updateLevel(int id);

src/Controller.cpp

@@ -26,6 +26,7 @@
 #include <QSqlQuery>
 
 #include "../src/assert.hpp"
+#include "Path.hpp"
 
 /**
  * @struct FileListItem
@@ -440,19 +441,19 @@ class Data : public QObject {
      *
      * @param path Full path to the datbase without the file name.
      */
-    bool initializeDatabase(const QString& path) {
+    bool initializeDatabase() {
         bool status = false;
-        const QString filePath = QString("%1/%2").arg(path, "tombll.db");
-        QFileInfo fileInfo(filePath);
+        Path path = Path(Path::resource);
+        path << "tombll.db";
 
         // Open the file
-        if (!fileInfo.exists() || !fileInfo.isFile()) {
+        if (!path.exists() || !path.isFile()) {
             qCritical()
-                << "Error: The database path is not a regular file: " << path;
+                << "Error: The database path is not a regular file: " << path.get();
             status = false;
         } else {
             db = QSqlDatabase::addDatabase("QSQLITE");
-            db.setDatabaseName(QString("%1/tombll.db").arg(path));
+            db.setDatabaseName(path.get());
             if (db.open() == true) {  // flawfinder: ignore
                 status = true;
             } else {

src/Controller.hpp

@@ -340,26 +340,3 @@ qint64 FileManager::removeFileOrDirectory(Path path) {
     }
     return status;
 }
-
-bool FileManager::setUpCamp(const QString& levelDir, const QString& gameDir) {
-    bool status = true;
-
-    QDir levelDirPath(levelDir);
-    if (!levelDirPath.exists() && !levelDirPath.mkpath(levelDir)) {
-        qWarning() << "Failed to create level directory:" << levelDir;
-        status = false;
-    } else {
-        m_levelDir.setPath(levelDir);
-    }
-
-    QDir gameDirPath(gameDir);
-    if (!gameDirPath.exists() && !gameDirPath.mkpath(gameDir)) {
-        qWarning() << "Failed to create game directory:" << gameDir;
-        status = false;
-    } else {
-        m_gameDir.setPath(gameDir);
-    }
-
-    return status;
-}
-

src/Data.hpp

@@ -201,21 +201,6 @@ class FileManager : public QObject {
      */
     qint64 removeFileOrDirectory(Path path);
 
-    /**
-     * @brief Sets the game launch directory and level directory.
-     *
-     * This function ensures that all file operations are contained within two directories:
-     * - One for installed game files, similar to "Program Files (x86)".
-     * - One for program files and downloaded levels.
-     *
-     * If the directories do not exist, it attempts to create them.
-     *
-     * @param levelDir The path to the level directory.
-     * @param gameDir The path to the game directory.
-     * @return `true` if both directories exist or were successfully created, `false` otherwise.
-     */
-    bool setUpCamp(const QString& levelDir, const QString& gameDir);
-
  signals:
     void fileWorkTickSignal();
 
@@ -227,8 +212,6 @@ class FileManager : public QObject {
         return path.startsWith(QDir::homePath());
     }
 
-    QDir m_levelDir;
-    QDir m_gameDir;
     const QString m_sep;
     Q_DISABLE_COPY(FileManager)
 };

src/FileManager.cpp

@@ -17,26 +17,20 @@
 #include "../src/assert.hpp"
 #include <QtGlobal>
 
-Model::Model() {}
-Model::~Model() {}
-
-bool Model::setupDirectories(const QString& level, const QString& game) {
-    bool status = false;
-
-    if (fileManager.setUpCamp(level, game) &&
-            data.initializeDatabase(level) &&
-            m_pyRunner.setUpCamp(level)) {
-        #ifndef TEST
-        Path::setProgramFilesPath();
-        Path::setResourcePath();
-        #endif
-        status = true;
-    }
-    return status;
+Model::Model() :
+        data(Data::getInstance()),
+        fileManager(FileManager::getInstance()),
+        downloader(Downloader::getInstance()) {
 }
 
-void Model::setup(const QString& level, const QString& game) {
-    if (setupDirectories(level, game) == true) {
+Model::~Model() {}
+
+void Model::setup() {
+    #ifndef TEST
+    Path::setProgramFilesPath();
+    Path::setResourcePath();
+    #endif
+    if(data.initializeDatabase()) {
         QList<int> commonFiles;
         checkCommonFiles(&commonFiles);
         // Iterate backward to avoid index shifting
@@ -58,8 +52,6 @@ void Model::setup(const QString& level, const QString& game) {
         emit generateListSignal(commonFiles);
         QCoreApplication::processEvents();
     } else {
-        // send signal to gui with error about setup fail
-        qDebug() << "setupDirectories setup failed";
     }
 }
 

src/FileManager.hpp

@@ -87,8 +87,7 @@ class Model : public QObject {
     const InfoData getInfo(int id);
     const int getType(int id);
     const QString getWalkthrough(int id);
-    bool setupDirectories(const QString& level, const QString& game);
-    void setup(const QString& level, const QString& game);
+    void setup();
     void updateLevel(const int id);
     void syncLevels();
 
@@ -111,9 +110,9 @@ class Model : public QObject {
     Runner m_bashRunner   = Runner("bash");
 
     PyRunner m_pyRunner;
-    Data& data = Data::getInstance();
-    FileManager& fileManager = FileManager::getInstance();
-    Downloader& downloader = Downloader::getInstance();
+    Data& data;
+    FileManager& fileManager;
+    Downloader& downloader;
 
     Model();
     ~Model();