Merge pull request #699 from Scrumplex/resolve-ftb-mods-cf

launcher/modplatform/flame/FileResolvingTask.cpp

@@ -7,6 +7,13 @@ Flame::FileResolvingTask::FileResolvingTask(const shared_qobject_ptr<QNetworkAcc
     : m_network(network), m_toProcess(toProcess)
 {}
 
+bool Flame::FileResolvingTask::abort()
+{
+    if (m_dljob)
+        return m_dljob->abort();
+    return true;
+}
+
 void Flame::FileResolvingTask::executeTask()
 {
     setStatus(tr("Resolving mod IDs..."));

launcher/modplatform/flame/FileResolvingTask.h

@@ -13,6 +13,9 @@ public:
     explicit FileResolvingTask(const shared_qobject_ptr<QNetworkAccessManager>& network, Flame::Manifest &toProcess);
     virtual ~FileResolvingTask() {};
 
+    bool canAbort() const override { return true; }
+    bool abort() override;
+
     const Flame::Manifest &getResults() const
     {
         return m_toProcess;

launcher/modplatform/modpacksch/FTBPackInstallTask.cpp

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 flowln <flowlnlnln@gmail.com>
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -40,103 +42,190 @@
 #include "Json.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
+#include "modplatform/flame/PackManifest.h"
 #include "net/ChecksumValidator.h"
 #include "settings/INISettingsObject.h"
 
-#include "BuildConfig.h"
 #include "Application.h"
+#include "BuildConfig.h"
+#include "ui/dialogs/ScrollMessageBox.h"
 
 namespace ModpacksCH {
 
-PackInstallTask::PackInstallTask(Modpack pack, QString version)
+PackInstallTask::PackInstallTask(Modpack pack, QString version, QWidget* parent)
-{
+    : m_pack(std::move(pack)), m_version_name(std::move(version)), m_parent(parent)
-    m_pack = pack;
+{}
-    m_version_name = version;
-}
 
 bool PackInstallTask::abort()
 {
-    if(abortable)
+    bool aborted = true;
-    {
+
-        return jobPtr->abort();
+    if (m_net_job)
-    }
+        aborted &= m_net_job->abort();
-    return false;
+    if (m_mod_id_resolver_task)
+        aborted &= m_mod_id_resolver_task->abort();
+
+    // FIXME: This should be 'emitAborted()', but InstanceStaging doesn't connect to the abort signal yet...
+    if (aborted)
+        emitFailed(tr("Aborted"));
+
+    return aborted;
 }
 
 void PackInstallTask::executeTask()
 {
+    setStatus(tr("Getting the manifest..."));
+
     // Find pack version
-    bool found = false;
+    auto version_it = std::find_if(m_pack.versions.constBegin(), m_pack.versions.constEnd(),
-    VersionInfo version;
+                                   [this](ModpacksCH::VersionInfo const& a) { return a.name == m_version_name; });
 
-    for(auto vInfo : m_pack.versions) {
+    if (version_it == m_pack.versions.constEnd()) {
-        if (vInfo.name == m_version_name) {
-            found = true;
-            version = vInfo;
-            break;
-        }
-    }
-
-    if(!found) {
         emitFailed(tr("Failed to find pack version %1").arg(m_version_name));
         return;
     }
 
-    auto *netJob = new NetJob("ModpacksCH::VersionFetch", APPLICATION->network());
+    auto version = *version_it;
-    auto searchUrl = QString(BuildConfig.MODPACKSCH_API_BASE_URL + "public/modpack/%1/%2").arg(m_pack.id).arg(version.id);
-    netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
-    jobPtr = netJob;
-    jobPtr->start();
 
-    QObject::connect(netJob, &NetJob::succeeded, this, &PackInstallTask::onDownloadSucceeded);
+    auto* netJob = new NetJob("ModpacksCH::VersionFetch", APPLICATION->network());
-    QObject::connect(netJob, &NetJob::failed, this, &PackInstallTask::onDownloadFailed);
+
+    auto searchUrl = QString(BuildConfig.MODPACKSCH_API_BASE_URL + "public/modpack/%1/%2").arg(m_pack.id).arg(version.id);
+    netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &m_response));
+
+    QObject::connect(netJob, &NetJob::succeeded, this, &PackInstallTask::onManifestDownloadSucceeded);
+    QObject::connect(netJob, &NetJob::failed, this, &PackInstallTask::onManifestDownloadFailed);
+    QObject::connect(netJob, &NetJob::progress, this, &PackInstallTask::setProgress);
+
+    m_net_job = netJob;
+
+    netJob->start();
 }
 
-void PackInstallTask::onDownloadSucceeded()
+void PackInstallTask::onManifestDownloadSucceeded()
 {
-    jobPtr.reset();
+    m_net_job.reset();
 
-    QJsonParseError parse_error;
+    QJsonParseError parse_error{};
-    QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error);
+    QJsonDocument doc = QJsonDocument::fromJson(m_response, &parse_error);
-    if(parse_error.error != QJsonParseError::NoError) {
+    if (parse_error.error != QJsonParseError::NoError) {
-        qWarning() << "Error while parsing JSON response from ModpacksCH at " << parse_error.offset << " reason: " << parse_error.errorString();
+        qWarning() << "Error while parsing JSON response from ModpacksCH at " << parse_error.offset
-        qWarning() << response;
+                   << " reason: " << parse_error.errorString();
+        qWarning() << m_response;
         return;
     }
 
-    auto obj = doc.object();
-
     ModpacksCH::Version version;
-    try
+    try {
-    {
+        auto obj = Json::requireObject(doc);
         ModpacksCH::loadVersion(version, obj);
-    }
+    } catch (const JSONValidationError& e) {
-    catch (const JSONValidationError &e)
-    {
         emitFailed(tr("Could not understand pack manifest:\n") + e.cause());
         return;
     }
+
     m_version = version;
 
-    downloadPack();
+    resolveMods();
 }
 
-void PackInstallTask::onDownloadFailed(QString reason)
+void PackInstallTask::resolveMods()
 {
-    jobPtr.reset();
+    setStatus(tr("Resolving mods..."));
-    emitFailed(reason);
+    setProgress(0, 100);
+
+    m_file_id_map.clear();
+
+    Flame::Manifest manifest;
+    int index = 0;
+
+    for (auto const& file : m_version.files) {
+        if (!file.serverOnly && file.url.isEmpty()) {
+            if (file.curseforge.file_id <= 0) {
+                emitFailed(tr("Invalid manifest: There's no information available to download the file '%1'!").arg(file.name));
+                return;
+            }
+
+            Flame::File flame_file;
+            flame_file.projectId = file.curseforge.project_id;
+            flame_file.fileId = file.curseforge.file_id;
+            flame_file.hash = file.sha1;
+
+            manifest.files.insert(flame_file.fileId, flame_file);
+            m_file_id_map.append(flame_file.fileId);
+        } else {
+            m_file_id_map.append(-1);
+        }
+
+        index++;
+    }
+
+    m_mod_id_resolver_task = new Flame::FileResolvingTask(APPLICATION->network(), manifest);
+
+    connect(m_mod_id_resolver_task.get(), &Flame::FileResolvingTask::succeeded, this, &PackInstallTask::onResolveModsSucceeded);
+    connect(m_mod_id_resolver_task.get(), &Flame::FileResolvingTask::failed, this, &PackInstallTask::onResolveModsFailed);
+    connect(m_mod_id_resolver_task.get(), &Flame::FileResolvingTask::progress, this, &PackInstallTask::setProgress);
+
+    m_mod_id_resolver_task->start();
+}
+
+void PackInstallTask::onResolveModsSucceeded()
+{
+    m_abortable = false;
+
+    QString text;
+    auto anyBlocked = false;
+
+    Flame::Manifest results = m_mod_id_resolver_task->getResults();
+    for (int index = 0; index < m_file_id_map.size(); index++) {
+        auto const file_id = m_file_id_map.at(index);
+        if (file_id < 0)
+            continue;
+
+        Flame::File results_file = results.files[file_id];
+        VersionFile& local_file = m_version.files[index];
+
+        // First check for blocked mods
+        if (!results_file.resolved || results_file.url.isEmpty()) {
+            QString type(local_file.type);
+
+            type[0] = type[0].toUpper();
+            text += QString("%1: %2 - <a href='%3'>%3</a><br/>").arg(type, local_file.name, results_file.websiteUrl);
+            anyBlocked = true;
+        } else {
+            local_file.url = results_file.url.toString();
+        }
+    }
+
+    m_mod_id_resolver_task.reset();
+
+    if (anyBlocked) {
+        qDebug() << "Blocked files found, displaying file list";
+
+        auto message_dialog = new ScrollMessageBox(m_parent, tr("Blocked files found"),
+                                                   tr("The following files are not available for download in third party launchers.<br/>"
+                                                      "You will need to manually download them and add them to the instance."),
+                                                   text);
+
+        if (message_dialog->exec() == QDialog::Accepted)
+            downloadPack();
+        else
+            abort();
+    } else {
+        downloadPack();
+    }
 }
 
 void PackInstallTask::downloadPack()
 {
     setStatus(tr("Downloading mods..."));
 
-    jobPtr = new NetJob(tr("Mod download"), APPLICATION->network());
+    auto* jobPtr = new NetJob(tr("Mod download"), APPLICATION->network());
-    for(auto file : m_version.files) {
+    for (auto const& file : m_version.files) {
-        if(file.serverOnly) continue;
+        if (file.serverOnly || file.url.isEmpty())
+            continue;
 
-        QFileInfo fileName(file.name);
+        QFileInfo file_info(file.name);
-        auto cacheName = fileName.completeBaseName() + "-" + file.sha1 + "." + fileName.suffix();
+        auto cacheName = file_info.completeBaseName() + "-" + file.sha1 + "." + file_info.suffix();
 
         auto entry = APPLICATION->metacache()->resolveEntry("ModpacksCHPacks", cacheName);
         entry->setStale(true);
@@ -144,58 +233,64 @@ void PackInstallTask::downloadPack()
         auto relpath = FS::PathCombine("minecraft", file.path, file.name);
         auto path = FS::PathCombine(m_stagingPath, relpath);
 
-        if (filesToCopy.contains(path)) {
+        if (m_files_to_copy.contains(path)) {
             qWarning() << "Ignoring" << file.url << "as a file of that path is already downloading.";
             continue;
         }
+
         qDebug() << "Will download" << file.url << "to" << path;
-        filesToCopy[path] = entry->getFullPath();
+        m_files_to_copy[path] = entry->getFullPath();
 
         auto dl = Net::Download::makeCached(file.url, entry);
         if (!file.sha1.isEmpty()) {
             auto rawSha1 = QByteArray::fromHex(file.sha1.toLatin1());
             dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
         }
+
         jobPtr->addNetAction(dl);
     }
 
-    connect(jobPtr.get(), &NetJob::succeeded, this, [&]()
+    connect(jobPtr, &NetJob::succeeded, this, &PackInstallTask::onModDownloadSucceeded);
-    {
+    connect(jobPtr, &NetJob::failed, this, &PackInstallTask::onModDownloadFailed);
-        abortable = false;
+    connect(jobPtr, &NetJob::progress, this, &PackInstallTask::setProgress);
-        jobPtr.reset();
-        install();
-    });
-    connect(jobPtr.get(), &NetJob::failed, [&](QString reason)
-    {
-        abortable = false;
-        jobPtr.reset();
-        emitFailed(reason);
-    });
-    connect(jobPtr.get(), &NetJob::progress, [&](qint64 current, qint64 total)
-    {
-        abortable = true;
-        setProgress(current, total);
-    });
 
+    m_net_job = jobPtr;
     jobPtr->start();
+
+    m_abortable = true;
+}
+
+void PackInstallTask::onModDownloadSucceeded()
+{
+    m_net_job.reset();
+    install();
 }
 
 void PackInstallTask::install()
 {
-    setStatus(tr("Copying modpack files"));
+    setStatus(tr("Copying modpack files..."));
+    setProgress(0, m_files_to_copy.size());
+    QCoreApplication::processEvents();
 
-    for (auto iter = filesToCopy.begin(); iter != filesToCopy.end(); iter++) {
+    m_abortable = false;
-        auto &to = iter.key();
+
-        auto &from = iter.value();
+    int i = 0;
+    for (auto iter = m_files_to_copy.constBegin(); iter != m_files_to_copy.constEnd(); iter++) {
+        auto& to = iter.key();
+        auto& from = iter.value();
         FS::copy fileCopyOperation(from, to);
-        if(!fileCopyOperation()) {
+        if (!fileCopyOperation()) {
             qWarning() << "Failed to copy" << from << "to" << to;
             emitFailed(tr("Failed to copy files"));
             return;
         }
+
+        setProgress(i++, m_files_to_copy.size());
+        QCoreApplication::processEvents();
     }
 
-    setStatus(tr("Installing modpack"));
+    setStatus(tr("Installing modpack..."));
+    QCoreApplication::processEvents();
 
     auto instanceConfigPath = FS::PathCombine(m_stagingPath, "instance.cfg");
     auto instanceSettings = std::make_shared<INISettingsObject>(instanceConfigPath);
@@ -205,20 +300,20 @@ void PackInstallTask::install()
     auto components = instance.getPackProfile();
     components->buildingFromScratch();
 
-    for(auto target : m_version.targets) {
+    for (auto target : m_version.targets) {
-        if(target.type == "game" && target.name == "minecraft") {
+        if (target.type == "game" && target.name == "minecraft") {
             components->setComponentVersion("net.minecraft", target.version, true);
             break;
         }
     }
 
-    for(auto target : m_version.targets) {
+    for (auto target : m_version.targets) {
-        if(target.type != "modloader") continue;
+        if (target.type != "modloader")
+            continue;
 
-        if(target.name == "forge") {
+        if (target.name == "forge") {
             components->setComponentVersion("net.minecraftforge", target.version);
-        }
+        } else if (target.name == "fabric") {
-        else if(target.name == "fabric") {
             components->setComponentVersion("net.fabricmc.fabric-loader", target.version);
         }
     }
@@ -245,4 +340,20 @@ void PackInstallTask::install()
     emitSucceeded();
 }
 
+void PackInstallTask::onManifestDownloadFailed(QString reason)
+{
+    m_net_job.reset();
+    emitFailed(reason);
 }
+void PackInstallTask::onResolveModsFailed(QString reason)
+{
+    m_net_job.reset();
+    emitFailed(reason);
+}
+void PackInstallTask::onModDownloadFailed(QString reason)
+{
+    m_net_job.reset();
+    emitFailed(reason);
+}
+
+}  // namespace ModpacksCH

launcher/modplatform/modpacksch/FTBPackInstallTask.h

@@ -1,4 +1,24 @@
+// SPDX-License-Identifier: GPL-3.0-only
 /*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
  *      Copyright 2020-2021 Jamie Mansfield <jmansfield@cadixdev.org>
  *      Copyright 2020-2021 Petr Mrazek <peterix@gmail.com>
  *
@@ -20,44 +40,60 @@
 #include "FTBPackManifest.h"
 
 #include "InstanceTask.h"
+#include "QObjectPtr.h"
+#include "modplatform/flame/FileResolvingTask.h"
 #include "net/NetJob.h"
 
+#include <QWidget>
+
 namespace ModpacksCH {
 
-class PackInstallTask : public InstanceTask
+class PackInstallTask final : public InstanceTask
 {
     Q_OBJECT
 
 public:
-    explicit PackInstallTask(Modpack pack, QString version);
+    explicit PackInstallTask(Modpack pack, QString version, QWidget* parent = nullptr);
-    virtual ~PackInstallTask(){}
+    ~PackInstallTask() override = default;
 
-    bool canAbort() const override { return true; }
+    bool canAbort() const override { return m_abortable; }
     bool abort() override;
 
 protected:
-    virtual void executeTask() override;
+    void executeTask() override;
 
 private slots:
-    void onDownloadSucceeded();
+    void onManifestDownloadSucceeded();
-    void onDownloadFailed(QString reason);
+    void onResolveModsSucceeded();
+    void onModDownloadSucceeded();
+
+    void onManifestDownloadFailed(QString reason);
+    void onResolveModsFailed(QString reason);
+    void onModDownloadFailed(QString reason);
 
 private:
+    void resolveMods();
     void downloadPack();
     void install();
 
 private:
-    bool abortable = false;
+    bool m_abortable = true;
 
-    NetJob::Ptr jobPtr;
+    NetJob::Ptr m_net_job = nullptr;
-    QByteArray response;
+    shared_qobject_ptr<Flame::FileResolvingTask> m_mod_id_resolver_task = nullptr;
+
+    QList<int> m_file_id_map;
+
+    QByteArray m_response;
 
     Modpack m_pack;
     QString m_version_name;
     Version m_version;
 
-    QMap<QString, QString> filesToCopy;
+    QMap<QString, QString> m_files_to_copy;
 
+    //FIXME: nuke
+    QWidget* m_parent;
 };
 
 }

launcher/modplatform/modpacksch/FTBPackManifest.cpp

@@ -1,4 +1,23 @@
+// SPDX-License-Identifier: GPL-3.0-only
 /*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
  *      Copyright 2020 Jamie Mansfield <jmansfield@cadixdev.org>
  *      Copyright 2020-2021 Petr Mrazek <peterix@gmail.com>
  *
@@ -127,13 +146,16 @@ static void loadVersionFile(ModpacksCH::VersionFile & a, QJsonObject & obj)
     a.path = Json::requireString(obj, "path");
     a.name = Json::requireString(obj, "name");
     a.version = Json::requireString(obj, "version");
-    a.url = Json::requireString(obj, "url");
+    a.url = Json::ensureString(obj, "url");  // optional
     a.sha1 = Json::requireString(obj, "sha1");
     a.size = Json::requireInteger(obj, "size");
     a.clientOnly = Json::requireBoolean(obj, "clientonly");
     a.serverOnly = Json::requireBoolean(obj, "serveronly");
     a.optional = Json::requireBoolean(obj, "optional");
     a.updated = Json::requireInteger(obj, "updated");
+    auto curseforgeObj = Json::ensureObject(obj, "curseforge");  // optional
+    a.curseforge.project_id = Json::ensureInteger(curseforgeObj, "project");
+    a.curseforge.file_id = Json::ensureInteger(curseforgeObj, "file");
 }
 
 void ModpacksCH::loadVersion(ModpacksCH::Version & m, QJsonObject & obj)

launcher/modplatform/modpacksch/FTBPackManifest.h

@@ -1,4 +1,23 @@
+// SPDX-License-Identifier: GPL-3.0-only
 /*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
  *      Copyright 2020-2021 Jamie Mansfield <jmansfield@cadixdev.org>
  *      Copyright 2020 Petr Mrazek <peterix@gmail.com>
  *
@@ -97,6 +116,12 @@ struct VersionTarget
     int64_t updated;
 };
 
+struct VersionFileCurseForge
+{
+    int project_id;
+    int file_id;
+};
+
 struct VersionFile
 {
     int id;
@@ -111,6 +136,7 @@ struct VersionFile
     bool serverOnly;
     bool optional;
     int64_t updated;
+    VersionFileCurseForge curseforge;
 };
 
 struct Version

launcher/ui/dialogs/ProgressDialog.cpp

@@ -43,7 +43,7 @@ void ProgressDialog::setSkipButton(bool present, QString label)
 void ProgressDialog::on_skipButton_clicked(bool checked)
 {
     Q_UNUSED(checked);
-    task->abort();
+    if (task->abort())
         QDialog::reject();
 }
 

launcher/ui/pages/modplatform/ftb/FtbPage.cpp

@@ -2,6 +2,7 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -126,7 +127,7 @@ void FtbPage::suggestCurrent()
         return;
     }
 
-    dialog->setSuggestedPack(selected.name + " " + selectedVersion, new ModpacksCH::PackInstallTask(selected, selectedVersion));
+    dialog->setSuggestedPack(selected.name + " " + selectedVersion, new ModpacksCH::PackInstallTask(selected, selectedVersion, this));
     for(auto art : selected.art) {
         if(art.type == "square") {
             QString editedLogoName;