Merge pull request #3 from WrenSwift/Dev

The Cloud has entered the chat

Author: WrenSwift

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "files.associations": {
-        "qmainwindow": "cpp"
+        "qmainwindow": "cpp",
+        "qstandarditemmodel": "cpp"
     }
 }

CMakeLists.txt

@@ -40,4 +40,4 @@ add_custom_command(
             "${CMAKE_CURRENT_SOURCE_DIR}/inc"
             "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/inc"
     COMMENT "Copying inclusions folder to the build directory..."
-)
+)

mainwindow.cpp

@@ -23,11 +23,13 @@
 #include <QJsonObject>
 #include <QByteArray>
 #include <QJsonArray>
+#include <QEventLoop>
 
-QString activeSubDirName = "Mods"; // Change this to your desired subdirectory
+QString activeSubDirName = "Mods"; // This is where the active mods are stored
 QString disabledSubDirName = "(d)Mods"; // Change this to your desired subdirectory
 QString csvFilePath = "inc/packsDil.csv";
-QString version = "1.0.0"; // Version of the application
+QString csvCloudPath = "https://wrenswift.com/packsDil.csv";
+QString version = "1.1.0"; // Version of the application
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -72,7 +74,7 @@ MainWindow::MainWindow(QWidget *parent)
     }
     if (!cachedGameSource.isEmpty()) {
         ui->gameLineEdit->setText(cachedGameSource);
-        populatePacksListWidget(cachedGameSource,csvFilePath);
+        loadPacksCsv(csvCloudPath, csvFilePath);
     }
 
     qDebug() << "Resource exists:" << QFile::exists(":/inc/packsDil.csv");
@@ -156,6 +158,65 @@ void MainWindow::doVersionCheck() {
         reply->deleteLater();
 }
 
+void MainWindow::loadPacksCsv(const QString &url, const QString &localPath)
+{
+    QNetworkAccessManager manager;
+    QEventLoop loop;
+    QNetworkReply *reply = manager.get(QNetworkRequest(QUrl(url)));
+    QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
+    loop.exec();
+
+    QByteArray csvData;
+    bool usedNetwork = false;
+
+    if (reply->error() == QNetworkReply::NoError) {
+        csvData = reply->readAll();
+        usedNetwork = true;
+        // Save the latest network version locally for future offline use
+        QFile localFile(localPath);
+        if (localFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+            localFile.write(csvData);
+            localFile.close();
+        }
+    } else {
+        // Network failed, try to load from local file
+        QFile localFile(localPath);
+        if (localFile.open(QIODevice::ReadOnly)) {
+            csvData = localFile.readAll();
+            localFile.close();
+            QMessageBox::warning(this, tr("Network Error"),
+                tr("Failed to download packs CSV from the cloud. Using local backup copy instead."));
+        } else {
+            QMessageBox::warning(this, tr("Network Error"),
+                tr("Failed to download packs CSV from the cloud and no local backup is available: %1").arg(reply->errorString()));
+            reply->deleteLater();
+            return;
+        }
+    }
+    reply->deleteLater();
+
+    // Parse CSV data (same as before)
+    QHash<QString, QString> folderMapping;
+    QTextStream in(csvData);
+    bool firstLine = true;
+    while (!in.atEnd()) {
+        QString line = in.readLine().trimmed();
+        if (line.isEmpty())
+            continue;
+        if (firstLine) {
+            firstLine = false;
+            // continue; // Uncomment if your CSV has a header
+        }
+        QStringList parts = line.split(',');
+        if (parts.size() >= 2) {
+            QString originalName = parts.at(0).trimmed();
+            QString friendlyName = parts.at(1).trimmed();
+            folderMapping.insert(originalName, friendlyName);
+        }
+    }
+    populatePacksListWidgetWithMapping(ui->gameLineEdit->text(), folderMapping);
+}
+
 void MainWindow::on_menuMods_clicked(){
     ui->mainStackedWidget->setCurrentIndex(0);
 }
@@ -614,8 +675,8 @@ void MainWindow::do_S4MPCheck() {
 
     if (foundS4MP) {
         QMessageBox::warning(this, tr("S4MP Detected"),
-            tr("\"S4MP Launcher Windows.exe\" is present in your active mods. "
-               "If you plan to use S4MP please use their launcher for pack selection after desired mods are selected."));
+            tr("'%1' is present in your active mods. "
+               "If you plan to use S4MP please use their launcher for pack selection after desired mods are selected.").arg(s4mpExeName));
     }
 }
 
@@ -742,6 +803,57 @@ void MainWindow::populatePacksListWidget(const QString &folderPath, const QStrin
     sortPacksListByCategory();
 }
 
+void MainWindow::populatePacksListWidgetWithMapping(const QString &folderPath, const QHash<QString, QString> &folderMapping)
+{
+    ui->packsListWidget->clear();
+
+    QSettings settings("Falcon", "SimsSwitcher");
+    QStringList checkedPacks = settings.value("packsSelection").toStringList();
+
+    QDir dir(folderPath);
+    QFileInfoList folderList = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+
+    for (const QFileInfo &info : folderList) {
+        QString originalName = info.fileName();
+        if (!folderMapping.contains(originalName))
+            continue;
+        QString displayName = folderMapping.value(originalName);
+        QListWidgetItem *item = new QListWidgetItem(displayName);
+        item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+        if (checkedPacks.contains(originalName))
+            item->setCheckState(Qt::Checked);
+        else
+            item->setCheckState(Qt::Unchecked);
+        item->setData(Qt::UserRole, info.absoluteFilePath());
+        item->setData(Qt::UserRole + 1, originalName);
+        ui->packsListWidget->addItem(item);
+        qDebug() << "Added folder:" << originalName << "as" << displayName
+                 << "Full path:" << info.absoluteFilePath();
+    }
+    // If any packs are present in the source directory that are not in the mapping, display a warning.
+    QStringList mappedNames = folderMapping.keys();
+    // Check for unmapped packs in the directory.
+    for (const QFileInfo &info : folderList) {
+        // Get the original name from the QFileInfo.
+        QString originalName = info.fileName();
+        // Sort out original names that are not in the format of "EP01", "GP02", etc.
+        if (originalName.length() < 4 || !originalName.startsWith("EP") && !originalName.startsWith("GP") &&
+            !originalName.startsWith("SP") && !originalName.startsWith("FP")) {
+            continue; // Skip names that do not match the expected format.
+        }
+        if (!mappedNames.contains(originalName)) {
+            // If the original name is not in the mapping, it means it's an unmapped pack.
+            qDebug() << "Unmapped pack found:" << originalName;
+            QMessageBox::warning(this, tr("Unmapped Pack Warning"),
+                                 tr("The pack '%1' is not mapped in the CSV file. "
+                                    "This could mean the packs data is out of date or another error is occuring. "
+                                    "If you have not recieved a Network Error please report the issue.").arg(originalName));
+        }
+    }
+    // Automatically call the sorting function to group items into categories.
+    sortPacksListByCategory();
+}
+
 void MainWindow::sortPacksListByCategory()
 {
     // Define alias-to-description mappings
@@ -825,7 +937,7 @@ void MainWindow::on_browseGameButton_clicked() {
         ui->gameLineEdit->setText(gameDir);
 
         // Populate the file list using the full path (Sims 4 Root + Subdirectory).
-        populatePacksListWidget(gameDir,csvFilePath);
+        loadPacksCsv(csvCloudPath, csvFilePath);
 
         // Use QSettings to store the full path including the subdirectory.
         QSettings settings("Falcon", "SimsSwitcher");

mainwindow.h

@@ -63,5 +63,7 @@ private slots:
     void doVersionCheck();
     void do_patreonLink();
     void do_S4MPCheck();
+    void loadPacksCsv(const QString &url, const QString &localPath);
+    void populatePacksListWidgetWithMapping(const QString &folderPath, const QHash<QString, QString> &folderMapping);
 };
 #endif // MAINWINDOW_H