fix database problem with original game file list

noisecode3 · noisecode3 · commit a6302121ac47 · 2024-12-21T03:01:43.000+01:00
diff --git a/src/Data.cpp b/src/Data.cpp
@@ -151,27 +151,20 @@ ZipData Data::getDownload(const int id) {
     return ZipData();
 }
 
-std::array<QVector<QString>, 2> Data::getFileList(const int id, bool trleList) {
+std::array<QVector<QString>, 2> Data::getFileList(const int id) {
     std::array<QVector<QString>, 2> list;
     QSqlQuery query(db);
-    if (trleList) {
-        query.prepare("SELECT Files.path, Files.md5sum "
-                "FROM Files "
-                "JOIN LevelFileList ON Files.FileID = LevelFileList.fileID "
-                "JOIN Level ON LevelFileList.levelID = Level.LevelID "
-                "WHERE Level.LevelID = :id");
-    } else {
-        query.prepare("SELECT Files.path, Files.md5sum "
-                "FROM Files "
-                "JOIN GameFileList ON Files.FileID = GameFileList.fileID "
-                "JOIN Game ON GameFileList.gameID = Game.GameID "
-                "WHERE Game.GameID = :id");
+    if (!query.prepare("SELECT File.path, File.md5sum "
+            "FROM File "
+            "JOIN GameFileList ON File.FileID = GameFileList.fileID "
+            "WHERE GameFileList.gameID = :id")) {
+        qDebug() << "Error preparing query:" << query.lastError().text();
     }
     query.bindValue(":id", id);
     if (query.exec()) {
         while (query.next()) {
-            list[0] << query.value("Files.path").toString();
-            list[1] << query.value("Files.md5sum").toString();
+            list[0] << query.value("path").toString();
+            list[1] << query.value("md5sum").toString();
         }
     } else {
         qDebug() << "Error executing query:" << query.lastError().text();
diff --git a/src/Data.hpp b/src/Data.hpp
@@ -198,7 +198,7 @@ class Data : public QObject {
     QString getWalkthrough(int id);
     int getType(int id);
 
-    std::array<QVector<QString>, 2> getFileList(const int id, bool trleList);
+    std::array<QVector<QString>, 2> getFileList(const int id);
     ZipData getDownload(int id);
 
  private:
diff --git a/src/FileManager.cpp b/src/FileManager.cpp
@@ -23,25 +23,25 @@
 #include "gameTree.hpp"
 
 bool FileManager::setUpCamp(const QString& levelDir, const QString& gameDir) {
+    bool status = true;
+
     QDir levelDirPath(levelDir);
-    if (!levelDirPath.exists()) {
-        if (!levelDirPath.mkpath(levelDir)) {
-            qWarning() << "Failed to create level directory:" << levelDir;
-            return false;
-        }
+    if (!levelDirPath.exists() && !levelDirPath.mkpath(levelDir)) {
+        qWarning() << "Failed to create level directory:" << levelDir;
+        status = false;
+    } else {
+        m_levelDir.setPath(levelDir);
     }
-    m_levelDir.setPath(levelDir);
 
     QDir gameDirPath(gameDir);
-    if (!gameDirPath.exists()) {
-        if (!gameDirPath.mkpath(gameDir)) {
-            qWarning() << "Failed to create game directory:" << gameDir;
-            return false;
-        }
+    if (!gameDirPath.exists() && !gameDirPath.mkpath(gameDir)) {
+        qWarning() << "Failed to create game directory:" << gameDir;
+        status = false;
+    } else {
+        m_gameDir.setPath(gameDir);
     }
-    m_gameDir.setPath(gameDir);
 
-    return true;
+    return status;
 }
 
 inline const QString FileManager::lookGameDir(
@@ -178,13 +178,13 @@ bool FileManager::extractZip(
 /**
  *
  */
-bool FileManager::checkDir(const QString& file, bool lookGameDir ) {
+bool FileManager::checkDir(const QString& file, bool lookGameDir) {
     const QString path = FileManager::lookGameDir(file, lookGameDir);
     QDir directory(path);
     return directory.exists();
 }
 
-bool FileManager::checkFile(const QString& file, bool lookGameDir ) {
+bool FileManager::checkFile(const QString& file, bool lookGameDir) {
     const QString path = FileManager::lookGameDir(file, lookGameDir);
     QFile fFile(path);
     return fFile.exists();
@@ -193,7 +193,7 @@ bool FileManager::checkFile(const QString& file, bool lookGameDir ) {
 int FileManager::checkFileInfo(const QString& file, bool lookGameDir) {
     const QString path = FileManager::lookGameDir(file, lookGameDir);
     QFileInfo fileInfo(path);
-    if (fileInfo.isDir()) {
+    if (fileInfo.isDir() == true) {
         qDebug() << "The path is a directory.";
         if (fileInfo.isSymLink() == true) {
             qDebug() << "return value 1:The path is a symbolic link.";
@@ -242,18 +242,18 @@ bool FileManager::makeRelativeLink(
         const QString& levelDir,
         const QString& from,
         const QString& to) {
-    const QString& l = m_levelDir.absolutePath() + levelDir;
-    const QString& f = l + from;
-    const QString& t = l + to;
+    const QString& levelPath = m_levelDir.absolutePath() + levelDir;
+    const QString& fromPath = levelPath + from;
+    const QString& toPath = levelPath + to;
 
-    if (QFile::link(f, t)) {
+    if (QFile::link(fromPath, toPath)) {
         qDebug() << "Symbolic link created successfully.";
         return 0;
     } else {
-        QFileInfo i(t);
+        QFileInfo i(toPath);
         if (i.isSymLink()) {
-            QFile::remove(t);
-            if (QFile::link(f, t)) {
+            QFile::remove(toPath);
+            if (QFile::link(fromPath, toPath)) {
                 qDebug() << "Symbolic link created successfully.";
                 return 0;
             } else {
@@ -405,17 +405,18 @@ bool FileManager::moveFilesToDirectory(
         dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
 
     // Move files and recursively move directories
-    for (const QString& entry : entryFileList) {
+    bool allMoved = std::all_of(
+            entryFileList.cbegin(),
+            entryFileList.cend(),
+            [&](const QString& entry) {
         QString entryPath = directoryFromPath + m_sep + entry;
-
-        if (!QFile::rename(
-            entryPath,
-            directoryToPath + m_sep + entry)) {
+        if (!QFile::rename(entryPath, directoryToPath + m_sep + entry)) {
             qWarning() << "Failed to move file:" << entryPath;
             return false;
         }
-    }
-    return true;
+        return true;
+    });
+    return allMoved;
 }
 
 bool FileManager::moveFilesToParentDirectory(
diff --git a/src/Model.cpp b/src/Model.cpp
@@ -41,9 +41,13 @@ Model::Model(QObject *parent) : QObject(parent), checkCommonFilesIndex_m(1) {
 
 Model::~Model() {}
 
-void Model::setup(const QString& level, const QString& game) {
-    setDirectory(level, game);
-    checkCommonFiles();
+bool Model::setup(const QString& level, const QString& game) {
+    bool status = false;
+    if (setDirectory(level, game)) {
+        status = true;
+        checkCommonFiles();
+    }
+    return status;
 }
 
 bool Model::setDirectory(const QString& level, const QString& game) {
@@ -56,19 +60,24 @@ bool Model::setDirectory(const QString& level, const QString& game) {
         return false;
 }
 
-void Model::checkCommonFiles() {
+// true if there was new original game
+// false if there was no new original games
+bool Model::checkCommonFiles() {
     int index = checkCommonFilesIndex_m;
     assert(index >= 1 && index <= 5);
     for (int i = index; i <= 5; i++) {
         if (checkGameDirectory(i) == 2) {
+            // checkCommonFilesIndex_m this is becouse it should start here
+            // becouse we use a return, we should only use 1 return...
             checkCommonFilesIndex_m = i+1;
             emit askGameSignal(i);
             QCoreApplication::processEvents();
-            return;
+            return true;
         }
     }
     emit generateListSignal();
     QCoreApplication::processEvents();
+    return false;
 }
 
 QString Model::getGameDirectory(int id) {
@@ -131,7 +140,7 @@ bool Model::setLink(int id) {
 }
 
 void Model::setupGame(int id) {
-    std::array<QVector<QString>, 2> list = data.getFileList(id, false);
+    std::array<QVector<QString>, 2> list = data.getFileList(id);
     const size_t s = list[0].size();
     const size_t sm = list[1].size();
     if (s != sm) {
@@ -140,8 +149,9 @@ void Model::setupGame(int id) {
             << " more or less checksums for the files\n";
         assert(false);
     }
-    const QString& sd = "/Original.TR" + QString::number(id) +"/";
-    const QString& sg = getGameDirectory(id) + "/";
+    assert(s != 0);
+    const QString sd = "/Original.TR" + QString::number(id) +"/";
+    const QString sg = getGameDirectory(id) + "/";
     for (size_t i = 0; i < s; i++) {
         const QString& fFile = list[0][i];
         const QString& fMd5sum = list[1][i];
@@ -157,8 +167,8 @@ void Model::setupGame(int id) {
         }
     }
     if (fileManager.backupGameDir(sg)) {
-        const QString&  src = sd.chopped(1);
-        const QString&  des = sg.chopped(1);
+        const QString  src = sd.chopped(1);
+        const QString  des = sg.chopped(1);
         if (!fileManager.linkGameDir(src, des)) {
             checkCommonFiles();
             return;
diff --git a/src/Model.hpp b/src/Model.hpp
@@ -54,7 +54,7 @@ class Model : public QObject {
         static Model instance;
         return instance;
     }
-    void checkCommonFiles();
+    bool checkCommonFiles();
     int checkGameDirectory(int id);
     int checkLevelDirectory(int id);
     void getList(QVector<ListItemData>* list);
@@ -66,7 +66,7 @@ class Model : public QObject {
     const InfoData getInfo(int id);
     const QString getWalkthrough(int id);
     bool setDirectory(const QString& level, const QString& game);
-    void setup(const QString& level, const QString& game);
+    bool setup(const QString& level, const QString& game);
 
  signals:
     void askGameSignal(int);
diff --git a/src/TombRaiderLinuxLauncher.cpp b/src/TombRaiderLinuxLauncher.cpp
@@ -422,13 +422,9 @@ void TombRaiderLinuxLauncher::linkClicked() {
     QListWidgetItem *selectedItem = ui->listWidgetModds->currentItem();
     int id = selectedItem->data(Qt::UserRole).toInt();
     if (id) {
-        if (!controller.link(id)) {
-            qDebug() << "Sumo linko el la compleeteo";
-        } else {
-            qDebug() << "Problemo de link";
-        }
+        qint64 status = controller.link(id);
     } else {
-        qDebug() << "Say no more";
+        qDebug() << "id error";
     }
     QApplication::quit();
 }
