NOISSUE put legacy FTB support in a namespace, fix its base URL

7 files changed, 0 insertions, 581 deletions

diff --git a/api/logic/modplatform/ftb/FtbPackFetchTask.cpp b/api/logic/modplatform/ftb/FtbPackFetchTask.cpp
deleted file mode 100644
index fe3f3fac..00000000
--- a/api/logic/modplatform/ftb/FtbPackFetchTask.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-#include "FtbPackFetchTask.h"
-#include <QDomDocument>
-#include "FtbPrivatePackManager.h"
-
-#include "net/URLConstants.h"
-
-void FtbPackFetchTask::fetch()
-{
-    publicPacks.clear();
-    thirdPartyPacks.clear();
-
-    NetJob *netJob = new NetJob("FtbModpackFetch");
-
-    QUrl publicPacksUrl = QUrl(URLConstants::FTB_CDN_BASE_URL + "static/modpacks.xml");
-    qDebug() << "Downloading public version info from" << publicPacksUrl.toString();
-    netJob->addNetAction(Net::Download::makeByteArray(publicPacksUrl, &publicModpacksXmlFileData));
-
-    QUrl thirdPartyUrl = QUrl(URLConstants::FTB_CDN_BASE_URL + "static/thirdparty.xml");
-    qDebug() << "Downloading thirdparty version info from" << thirdPartyUrl.toString();
-    netJob->addNetAction(Net::Download::makeByteArray(thirdPartyUrl, &thirdPartyModpacksXmlFileData));
-
-    QObject::connect(netJob, &NetJob::succeeded, this, &FtbPackFetchTask::fileDownloadFinished);
-    QObject::connect(netJob, &NetJob::failed, this, &FtbPackFetchTask::fileDownloadFailed);
-
-    jobPtr.reset(netJob);
-    netJob->start();
-}
-
-void FtbPackFetchTask::fetchPrivate(const QStringList & toFetch)
-{
-    QString privatePackBaseUrl = URLConstants::FTB_CDN_BASE_URL + "static/%1.xml";
-
-    for (auto &packCode: toFetch)
-    {
-        QByteArray *data = new QByteArray();
-        NetJob *job = new NetJob("Fetching private pack");
-        job->addNetAction(Net::Download::makeByteArray(privatePackBaseUrl.arg(packCode), data));
-
-        QObject::connect(job, &NetJob::succeeded, this, [this, job, data, packCode]
-        {
-            FtbModpackList packs;
-            parseAndAddPacks(*data, FtbPackType::Private, packs);
-            foreach(FtbModpack currentPack, packs)
-            {
-                currentPack.packCode = packCode;
-                emit privateFileDownloadFinished(currentPack);
-            }
-
-            job->deleteLater();
-
-            data->clear();
-            delete data;
-        });
-
-        QObject::connect(job, &NetJob::failed, this, [this, job, packCode, data](QString reason)
-        {
-            emit privateFileDownloadFailed(reason, packCode);
-            job->deleteLater();
-
-            data->clear();
-            delete data;
-        });
-
-        job->start();
-    }
-}
-
-void FtbPackFetchTask::fileDownloadFinished()
-{
-    jobPtr.reset();
-
-    QStringList failedLists;
-
-    if(!parseAndAddPacks(publicModpacksXmlFileData, FtbPackType::Public, publicPacks))
-    {
-        failedLists.append(tr("Public Packs"));
-    }
-
-    if(!parseAndAddPacks(thirdPartyModpacksXmlFileData, FtbPackType::ThirdParty, thirdPartyPacks))
-    {
-        failedLists.append(tr("Third Party Packs"));
-    }
-
-    if(failedLists.size() > 0)
-    {
-        emit failed(tr("Failed to download some pack lists: %1").arg(failedLists.join("\n- ")));
-    }
-    else
-    {
-        emit finished(publicPacks, thirdPartyPacks);
-    }
-}
-
-bool FtbPackFetchTask::parseAndAddPacks(QByteArray &data, FtbPackType packType, FtbModpackList &list)
-{
-    QDomDocument doc;
-
-    QString errorMsg = "Unknown error.";
-    int errorLine = -1;
-    int errorCol = -1;
-
-    if(!doc.setContent(data, false, &errorMsg, &errorLine, &errorCol))
-    {
-        auto fullErrMsg = QString("Failed to fetch modpack data: %1 %2:3d!").arg(errorMsg, errorLine, errorCol);
-        qWarning() << fullErrMsg;
-        data.clear();
-        return false;
-    }
-
-    QDomNodeList nodes = doc.elementsByTagName("modpack");
-    for(int i = 0; i < nodes.length(); i++)
-    {
-        QDomElement element = nodes.at(i).toElement();
-
-        FtbModpack modpack;
-        modpack.name = element.attribute("name");
-        modpack.currentVersion = element.attribute("version");
-        modpack.mcVersion = element.attribute("mcVersion");
-        modpack.description = element.attribute("description");
-        modpack.mods = element.attribute("mods");
-        modpack.logo = element.attribute("logo");
-        modpack.oldVersions = element.attribute("oldVersions").split(";");
-        modpack.broken = false;
-        modpack.bugged = false;
-
-        //remove empty if the xml is bugged
-        for(QString curr : modpack.oldVersions)
-        {
-            if(curr.isNull() || curr.isEmpty())
-            {
-                modpack.oldVersions.removeAll(curr);
-                modpack.bugged = true;
-                qWarning() << "Removed some empty versions from" << modpack.name;
-            }
-        }
-
-        if(modpack.oldVersions.size() < 1)
-        {
-            if(!modpack.currentVersion.isNull() && !modpack.currentVersion.isEmpty())
-            {
-                modpack.oldVersions.append(modpack.currentVersion);
-                qWarning() << "Added current version to oldVersions because oldVersions was empty! (" + modpack.name + ")";
-            }
-            else
-            {
-                modpack.broken = true;
-                qWarning() << "Broken pack:" << modpack.name << " => No valid version!";
-            }
-        }
-
-        modpack.author = element.attribute("author");
-
-        modpack.dir = element.attribute("dir");
-        modpack.file = element.attribute("url");
-
-        modpack.type = packType;
-
-        list.append(modpack);
-    }
-
-    return true;
-}
-
-void FtbPackFetchTask::fileDownloadFailed(QString reason)
-{
-    qWarning() << "Fetching FtbPacks failed:" << reason;
-    emit failed(reason);
-}
diff --git a/api/logic/modplatform/ftb/FtbPackFetchTask.h b/api/logic/modplatform/ftb/FtbPackFetchTask.h
deleted file mode 100644
index f955fe83..00000000
--- a/api/logic/modplatform/ftb/FtbPackFetchTask.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include "net/NetJob.h"
-#include <QTemporaryDir>
-#include <QByteArray>
-#include <QObject>
-#include "PackHelpers.h"
-
-class MULTIMC_LOGIC_EXPORT FtbPackFetchTask : public QObject {
-
-    Q_OBJECT
-
-public:
-    FtbPackFetchTask() = default;
-    virtual ~FtbPackFetchTask() = default;
-
-    void fetch();
-    void fetchPrivate(const QStringList &toFetch);
-
-private:
-    NetJobPtr jobPtr;
-
-    QByteArray publicModpacksXmlFileData;
-    QByteArray thirdPartyModpacksXmlFileData;
-
-    bool parseAndAddPacks(QByteArray &data, FtbPackType packType, FtbModpackList &list);
-    FtbModpackList publicPacks;
-    FtbModpackList thirdPartyPacks;
-
-protected slots:
-    void fileDownloadFinished();
-    void fileDownloadFailed(QString reason);
-
-signals:
-    void finished(FtbModpackList publicPacks, FtbModpackList thirdPartyPacks);
-    void failed(QString reason);
-
-    void privateFileDownloadFinished(FtbModpack modpack);
-    void privateFileDownloadFailed(QString reason, QString packCode);
-};
diff --git a/api/logic/modplatform/ftb/FtbPackInstallTask.cpp b/api/logic/modplatform/ftb/FtbPackInstallTask.cpp
deleted file mode 100644
index 4962bcac..00000000
--- a/api/logic/modplatform/ftb/FtbPackInstallTask.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-#include "FtbPackInstallTask.h"
-#include "Env.h"
-#include "MMCZip.h"
-#include "QtConcurrent"
-#include "BaseInstance.h"
-#include "FileSystem.h"
-#include "settings/INISettingsObject.h"
-#include "minecraft/MinecraftInstance.h"
-#include "minecraft/ComponentList.h"
-#include "minecraft/GradleSpecifier.h"
-
-#include "net/URLConstants.h"
-
-FtbPackInstallTask::FtbPackInstallTask(FtbModpack pack, QString version)
-{
-    m_pack = pack;
-    m_version = version;
-}
-
-void FtbPackInstallTask::executeTask()
-{
-    downloadPack();
-}
-
-void FtbPackInstallTask::downloadPack()
-{
-    setStatus(tr("Downloading zip for %1").arg(m_pack.name));
-
-    auto packoffset = QString("%1/%2/%3").arg(m_pack.dir, m_version.replace(".", "_"), m_pack.file);
-    auto entry = ENV.metacache()->resolveEntry("FTBPacks", packoffset);
-    NetJob *job = new NetJob("Download FTB Pack");
-
-    entry->setStale(true);
-    QString url;
-    if(m_pack.type == FtbPackType::Private)
-    {
-        url = QString(URLConstants::FTB_CDN_BASE_URL + "privatepacks/%1").arg(packoffset);
-    }
-    else
-    {
-        url = QString(URLConstants::FTB_CDN_BASE_URL + "modpacks/%1").arg(packoffset);
-    }
-    job->addNetAction(Net::Download::makeCached(url, entry));
-    archivePath = entry->getFullPath();
-
-    netJobContainer.reset(job);
-    connect(job, &NetJob::succeeded, this, &FtbPackInstallTask::onDownloadSucceeded);
-    connect(job, &NetJob::failed, this, &FtbPackInstallTask::onDownloadFailed);
-    connect(job, &NetJob::progress, this, &FtbPackInstallTask::onDownloadProgress);
-    job->start();
-
-    progress(1, 4);
-}
-
-void FtbPackInstallTask::onDownloadSucceeded()
-{
-    abortable = false;
-    unzip();
-}
-
-void FtbPackInstallTask::onDownloadFailed(QString reason)
-{
-    abortable = false;
-    emitFailed(reason);
-}
-
-void FtbPackInstallTask::onDownloadProgress(qint64 current, qint64 total)
-{
-    abortable = true;
-    progress(current, total * 4);
-    setStatus(tr("Downloading zip for %1 (%2%)").arg(m_pack.name).arg(current / 10));
-}
-
-void FtbPackInstallTask::unzip()
-{
-    progress(2, 4);
-    setStatus(tr("Extracting modpack"));
-    QDir extractDir(m_stagingPath);
-
-    m_packZip.reset(new QuaZip(archivePath));
-    if(!m_packZip->open(QuaZip::mdUnzip))
-    {
-        emitFailed(tr("Failed to open modpack file %1!").arg(archivePath));
-        return;
-    }
-
-    m_extractFuture = QtConcurrent::run(QThreadPool::globalInstance(), MMCZip::extractDir, archivePath, extractDir.absolutePath() + "/unzip");
-    connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::finished, this, &FtbPackInstallTask::onUnzipFinished);
-    connect(&m_extractFutureWatcher, &QFutureWatcher<QStringList>::canceled, this, &FtbPackInstallTask::onUnzipCanceled);
-    m_extractFutureWatcher.setFuture(m_extractFuture);
-}
-
-void FtbPackInstallTask::onUnzipFinished()
-{
-    install();
-}
-
-void FtbPackInstallTask::onUnzipCanceled()
-{
-    emitAborted();
-}
-
-void FtbPackInstallTask::install()
-{
-    progress(3, 4);
-    setStatus(tr("Installing modpack"));
-    QDir unzipMcDir(m_stagingPath + "/unzip/minecraft");
-    if(unzipMcDir.exists())
-    {
-        //ok, found minecraft dir, move contents to instance dir
-        if(!QDir().rename(m_stagingPath + "/unzip/minecraft", m_stagingPath + "/.minecraft"))
-        {
-            emitFailed(tr("Failed to move unzipped minecraft!"));
-            return;
-        }
-    }
-
-    QString instanceConfigPath = FS::PathCombine(m_stagingPath, "instance.cfg");
-    auto instanceSettings = std::make_shared<INISettingsObject>(instanceConfigPath);
-    instanceSettings->registerSetting("InstanceType", "Legacy");
-    instanceSettings->set("InstanceType", "OneSix");
-
-    MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath);
-    auto components = instance.getComponentList();
-    components->buildingFromScratch();
-    components->setComponentVersion("net.minecraft", m_pack.mcVersion, true);
-
-    bool fallback = true;
-
-    //handle different versions
-    QFile packJson(m_stagingPath + "/.minecraft/pack.json");
-    QDir jarmodDir = QDir(m_stagingPath + "/unzip/instMods");
-    if(packJson.exists())
-    {
-        packJson.open(QIODevice::ReadOnly | QIODevice::Text);
-        QJsonDocument doc = QJsonDocument::fromJson(packJson.readAll());
-        packJson.close();
-
-        //we only care about the libs
-        QJsonArray libs = doc.object().value("libraries").toArray();
-
-        foreach (const QJsonValue &value, libs)
-        {
-            QString nameValue = value.toObject().value("name").toString();
-            if(!nameValue.startsWith("net.minecraftforge"))
-            {
-                continue;
-            }
-
-            GradleSpecifier forgeVersion(nameValue);
-
-            components->setComponentVersion("net.minecraftforge", forgeVersion.version().replace(m_pack.mcVersion, "").replace("-", ""));
-            packJson.remove();
-            fallback = false;
-            break;
-        }
-
-    }
-
-    if(jarmodDir.exists())
-    {
-        qDebug() << "Found jarmods, installing...";
-
-        QStringList jarmods;
-        for (auto info: jarmodDir.entryInfoList(QDir::NoDotAndDotDot | QDir::Files))
-        {
-            qDebug() << "Jarmod:" << info.fileName();
-            jarmods.push_back(info.absoluteFilePath());
-        }
-
-        components->installJarMods(jarmods);
-        fallback = false;
-    }
-
-    //just nuke unzip directory, it s not needed anymore
-    FS::deletePath(m_stagingPath + "/unzip");
-
-    if(fallback)
-    {
-        //TODO: Some fallback mechanism... or just keep failing!
-        emitFailed(tr("No installation method found!"));
-        return;
-    }
-
-    components->saveNow();
-
-    progress(4, 4);
-
-    instance.setName(m_instName);
-    if(m_instIcon == "default")
-    {
-        m_instIcon = "ftb_logo";
-    }
-    instance.setIconKey(m_instIcon);
-    instanceSettings->resumeSave();
-
-    emitSucceeded();
-}
-
-bool FtbPackInstallTask::abort()
-{
-    if(abortable)
-    {
-        return netJobContainer->abort();
-    }
-    return false;
-}
diff --git a/api/logic/modplatform/ftb/FtbPackInstallTask.h b/api/logic/modplatform/ftb/FtbPackInstallTask.h
deleted file mode 100644
index 3319025e..00000000
--- a/api/logic/modplatform/ftb/FtbPackInstallTask.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-#include "InstanceTask.h"
-#include "net/NetJob.h"
-#include "quazip.h"
-#include "quazipdir.h"
-#include "meta/Index.h"
-#include "meta/Version.h"
-#include "meta/VersionList.h"
-#include "modplatform/ftb/PackHelpers.h"
-
-class MULTIMC_LOGIC_EXPORT FtbPackInstallTask : public InstanceTask
-{
-    Q_OBJECT
-
-public:
-    explicit FtbPackInstallTask(FtbModpack pack, QString version);
-    virtual ~FtbPackInstallTask(){}
-
-    bool abort() override;
-
-protected:
-    //! Entry point for tasks.
-    virtual void executeTask() override;
-
-private:
-    void downloadPack();
-    void unzip();
-    void install();
-
-private slots:
-    void onDownloadSucceeded();
-    void onDownloadFailed(QString reason);
-    void onDownloadProgress(qint64 current, qint64 total);
-
-    void onUnzipFinished();
-    void onUnzipCanceled();
-
-private: /* data */
-    bool abortable = false;
-    std::unique_ptr<QuaZip> m_packZip;
-    QFuture<QStringList> m_extractFuture;
-    QFutureWatcher<QStringList> m_extractFutureWatcher;
-    NetJobPtr netJobContainer;
-    QString archivePath;
-
-    FtbModpack m_pack;
-    QString m_version;
-};
diff --git a/api/logic/modplatform/ftb/FtbPrivatePackManager.cpp b/api/logic/modplatform/ftb/FtbPrivatePackManager.cpp
deleted file mode 100644
index c3477cec..00000000
--- a/api/logic/modplatform/ftb/FtbPrivatePackManager.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "FtbPrivatePackManager.h"
-
-#include <QDebug>
-
-#include "FileSystem.h"
-
-void FtbPrivatePackManager::load()
-{
-    try
-    {
-        currentPacks = QString::fromUtf8(FS::read(m_filename)).split('\n', QString::SkipEmptyParts).toSet();
-        dirty = false;
-    }
-    catch(...)
-    {
-        currentPacks = {};
-        qWarning() << "Failed to read third party FTB pack codes from" << m_filename;
-    }
-}
-
-void FtbPrivatePackManager::save() const
-{
-    if(!dirty)
-    {
-        return;
-    }
-    try
-    {
-        QStringList list = currentPacks.toList();
-        FS::write(m_filename, list.join('\n').toUtf8());
-        dirty = false;
-    }
-    catch(...)
-    {
-        qWarning() << "Failed to write third party FTB pack codes to" << m_filename;
-    }
-}
diff --git a/api/logic/modplatform/ftb/FtbPrivatePackManager.h b/api/logic/modplatform/ftb/FtbPrivatePackManager.h
deleted file mode 100644
index 388224d6..00000000
--- a/api/logic/modplatform/ftb/FtbPrivatePackManager.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include <QSet>
-#include <QString>
-#include <QFile>
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT FtbPrivatePackManager
-{
-public:
-    ~FtbPrivatePackManager()
-    {
-        save();
-    }
-    void load();
-    void save() const;
-    bool empty() const
-    {
-        return currentPacks.empty();
-    }
-    const QSet<QString> &getCurrentPackCodes() const
-    {
-        return currentPacks;
-    }
-    void add(const QString &code)
-    {
-        currentPacks.insert(code);
-        dirty = true;
-    }
-    void remove(const QString &code)
-    {
-        currentPacks.remove(code);
-        dirty = true;
-    }
-
-private:
-    QSet<QString> currentPacks;
-    QString m_filename = "private_packs.txt";
-    mutable bool dirty = false;
-};
diff --git a/api/logic/modplatform/ftb/PackHelpers.h b/api/logic/modplatform/ftb/PackHelpers.h
deleted file mode 100644
index 4306caee..00000000
--- a/api/logic/modplatform/ftb/PackHelpers.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <QMetaType>
-
-//Header for structs etc...
-enum class FtbPackType
-{
-    Public,
-    ThirdParty,
-    Private
-};
-
-struct FtbModpack
-{
-    QString name;
-    QString description;
-    QString author;
-    QStringList oldVersions;
-    QString currentVersion;
-    QString mcVersion;
-    QString mods;
-    QString logo;
-
-    //Technical data
-    QString dir;
-    QString file; //<- Url in the xml, but doesn't make much sense
-
-    bool bugged = false;
-    bool broken = false;
-
-    FtbPackType type;
-    QString packCode;
-};
-
-//We need it for the proxy model
-Q_DECLARE_METATYPE(FtbModpack)
-
-typedef QList<FtbModpack> FtbModpackList;