Merge branch 'develop' into better-launch

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

5 files changed, 76 insertions, 100 deletions

diff --git a/launcher/ui/pages/modplatform/technic/TechnicData.h b/launcher/ui/pages/modplatform/technic/TechnicData.h
index cd2ea8e1..fc7fa4d3 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicData.h
+++ b/launcher/ui/pages/modplatform/technic/TechnicData.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2021-2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -63,6 +63,6 @@ struct Modpack {
     QString recommended;
     QVector<QString> versions;
 };
-}
+}  // namespace Technic
 
 Q_DECLARE_METATYPE(Technic::Modpack)
diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
index f08eb289..e8c5ac92 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2021 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -38,6 +38,8 @@
 #include "BuildConfig.h"
 #include "Json.h"
 
+#include "net/ApiDownload.h"
+
 #include <QIcon>
 
 Technic::ListModel::ListModel(QObject* parent) : QAbstractListModel(parent) {}
@@ -116,7 +118,7 @@ void Technic::ListModel::performSearch()
             QString("%1search?build=%2&q=%3").arg(BuildConfig.TECHNIC_API_BASE_URL, BuildConfig.TECHNIC_API_BUILD, currentSearchTerm);
         searchMode = List;
     }
-    netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), response));
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl), response));
     jobPtr = netJob;
     jobPtr->start();
     QObject::connect(netJob.get(), &NetJob::succeeded, this, &ListModel::searchRequestFinished);
@@ -157,7 +159,7 @@ void Technic::ListModel::searchRequestFinished()
                         pack.logoName = "null";
                     } else {
                         pack.logoUrl = rawURL;
-                        pack.logoName = rawURL.section(QLatin1Char('/'), -1).section(QLatin1Char('.'), 0, 0);
+                        pack.logoName = rawURL.section(QLatin1Char('/'), -1);
                     }
                     pack.broken = false;
                     newList.append(pack);
@@ -179,7 +181,7 @@ void Technic::ListModel::searchRequestFinished()
                     auto iconUrl = Json::requireString(iconObj, "url");
 
                     pack.logoUrl = iconUrl;
-                    pack.logoName = iconUrl.section(QLatin1Char('/'), -1).section(QLatin1Char('.'), 0, 0);
+                    pack.logoName = iconUrl.section(QLatin1Char('/'), -1);
                 } else {
                     pack.logoUrl = "null";
                     pack.logoName = "null";
@@ -254,7 +256,7 @@ void Technic::ListModel::requestLogo(QString logo, QString url)
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("TechnicPacks", QString("logos/%1").arg(logo));
     auto job = new NetJob(QString("Technic Icon Download %1").arg(logo), APPLICATION->network());
-    job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
+    job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
 
diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.h b/launcher/ui/pages/modplatform/technic/TechnicModel.h
index 0f1a814e..d7a635d4 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicModel.h
+++ b/launcher/ui/pages/modplatform/technic/TechnicModel.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2021 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
index fc678fa2..54b86feb 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2021-2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -41,16 +41,17 @@
 #include "ui/dialogs/NewInstanceDialog.h"
 
 #include "BuildConfig.h"
+#include "Json.h"
 #include "TechnicModel.h"
 #include "modplatform/technic/SingleZipPackInstallTask.h"
 #include "modplatform/technic/SolderPackInstallTask.h"
-#include "Json.h"
 
 #include "Application.h"
 #include "modplatform/technic/SolderPackManifest.h"
 
-TechnicPage::TechnicPage(NewInstanceDialog* dialog, QWidget *parent)
-    : QWidget(parent), ui(new Ui::TechnicPage), dialog(dialog)
+#include "net/ApiDownload.h"
+
+TechnicPage::TechnicPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), ui(new Ui::TechnicPage), dialog(dialog)
 {
     ui->setupUi(this);
     connect(ui->searchButton, &QPushButton::clicked, this, &TechnicPage::triggerSearch);
@@ -96,18 +97,17 @@ void TechnicPage::openedImpl()
     triggerSearch();
 }
 
-void TechnicPage::triggerSearch() {
+void TechnicPage::triggerSearch()
+{
     model->searchWithTerm(ui->searchEdit->text());
 }
 
-void TechnicPage::onSelectionChanged(QModelIndex first, QModelIndex second)
+void TechnicPage::onSelectionChanged(QModelIndex first, [[maybe_unused]] QModelIndex second)
 {
     ui->versionSelectionBox->clear();
 
-    if(!first.isValid())
-    {
-        if(isOpened)
-        {
+    if (!first.isValid()) {
+        if (isOpened) {
             dialog->setSuggestedPack();
         }
         return;
@@ -119,74 +119,60 @@ void TechnicPage::onSelectionChanged(QModelIndex first, QModelIndex second)
 
 void TechnicPage::suggestCurrent()
 {
-    if (!isOpened)
-    {
+    if (!isOpened) {
         return;
     }
-    if (current.broken)
-    {
+    if (current.broken) {
         dialog->setSuggestedPack();
         return;
     }
 
-    QString editedLogoName = "technic_" + current.logoName.section(".", 0, 0);
-    model->getLogo(current.logoName, current.logoUrl, [this, editedLogoName](QString logo)
-    {
-        dialog->setSuggestedIconFromFile(logo, editedLogoName);
-    });
+    QString editedLogoName = "technic_" + current.logoName;
+    model->getLogo(current.logoName, current.logoUrl,
+                   [this, editedLogoName](QString logo) { dialog->setSuggestedIconFromFile(logo, editedLogoName); });
 
-    if (current.metadataLoaded)
-    {
+    if (current.metadataLoaded) {
         metadataLoaded();
         return;
     }
 
     auto netJob = makeShared<NetJob>(QString("Technic::PackMeta(%1)").arg(current.name), APPLICATION->network());
     QString slug = current.slug;
-    netJob->addNetAction(Net::Download::makeByteArray(QString("%1modpack/%2?build=%3").arg(BuildConfig.TECHNIC_API_BASE_URL, slug, BuildConfig.TECHNIC_API_BUILD), response));
-    QObject::connect(netJob.get(), &NetJob::succeeded, this, [this, slug]
-    {
+    netJob->addNetAction(Net::ApiDownload::makeByteArray(
+        QString("%1modpack/%2?build=%3").arg(BuildConfig.TECHNIC_API_BASE_URL, slug, BuildConfig.TECHNIC_API_BUILD), response));
+    QObject::connect(netJob.get(), &NetJob::succeeded, this, [this, slug] {
         jobPtr.reset();
 
-        if (current.slug != slug)
-        {
+        if (current.slug != slug) {
             return;
         }
 
-        QJsonParseError parse_error {};
+        QJsonParseError parse_error{};
         QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
         QJsonObject obj = doc.object();
-        if(parse_error.error != QJsonParseError::NoError)
-        {
-            qWarning() << "Error while parsing JSON response from Technic at " << parse_error.offset << " reason: " << parse_error.errorString();
+        if (parse_error.error != QJsonParseError::NoError) {
+            qWarning() << "Error while parsing JSON response from Technic at " << parse_error.offset
+                       << " reason: " << parse_error.errorString();
             qWarning() << *response;
             return;
         }
-        if (!obj.contains("url"))
-        {
+        if (!obj.contains("url")) {
             qWarning() << "Json doesn't contain an url key";
             return;
         }
         QJsonValueRef url = obj["url"];
-        if (url.isString())
-        {
+        if (url.isString()) {
             current.url = url.toString();
-        }
-        else
-        {
-            if (!obj.contains("solder"))
-            {
+        } else {
+            if (!obj.contains("solder")) {
                 qWarning() << "Json doesn't contain a valid url or solder key";
                 return;
             }
             QJsonValueRef solderUrl = obj["solder"];
-            if (solderUrl.isString())
-            {
+            if (solderUrl.isString()) {
                 current.url = solderUrl.toString();
                 current.isSolder = true;
-            }
-            else
-            {
+            } else {
                 qWarning() << "Json doesn't contain a valid url or solder key";
                 return;
             }
@@ -227,29 +213,28 @@ void TechnicPage::metadataLoaded()
 
     // Strip trailing forward-slashes from Solder URL's
     if (current.isSolder) {
-        while (current.url.endsWith('/')) current.url.chop(1);
+        while (current.url.endsWith('/'))
+            current.url.chop(1);
     }
 
     // Display versions from Solder
     if (!current.isSolder) {
         // If the pack isn't a Solder pack, it only has the single version
         ui->versionSelectionBox->addItem(current.currentVersion);
-    }
-    else if (current.versionsLoaded) {
+    } else if (current.versionsLoaded) {
         // reverse foreach, so that the newest versions are first
         for (auto i = current.versions.size(); i--;) {
             ui->versionSelectionBox->addItem(current.versions.at(i));
         }
         ui->versionSelectionBox->setCurrentText(current.recommended);
-    }
-    else {
+    } else {
         // For now, until the versions are pulled from the Solder instance, display the current
         // version so we can display something quicker
         ui->versionSelectionBox->addItem(current.currentVersion);
 
         auto netJob = makeShared<NetJob>(QString("Technic::SolderMeta(%1)").arg(current.name), APPLICATION->network());
         auto url = QString("%1/modpack/%2").arg(current.url, current.slug);
-        netJob->addNetAction(Net::Download::makeByteArray(QUrl(url), response));
+        netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(url), response));
 
         QObject::connect(netJob.get(), &NetJob::succeeded, this, &TechnicPage::onSolderLoaded);
 
@@ -260,7 +245,8 @@ void TechnicPage::metadataLoaded()
     selectVersion();
 }
 
-void TechnicPage::selectVersion() {
+void TechnicPage::selectVersion()
+{
     if (!isOpened) {
         return;
     }
@@ -269,17 +255,18 @@ void TechnicPage::selectVersion() {
         return;
     }
 
-    if (!current.isSolder)
-    {
-        dialog->setSuggestedPack(current.name, selectedVersion, new Technic::SingleZipPackInstallTask(current.url, current.minecraftVersion));
-    }
-    else
-    {
-        dialog->setSuggestedPack(current.name, selectedVersion, new Technic::SolderPackInstallTask(APPLICATION->network(), current.url, current.slug, selectedVersion, current.minecraftVersion));
+    if (!current.isSolder) {
+        dialog->setSuggestedPack(current.name, selectedVersion,
+                                 new Technic::SingleZipPackInstallTask(current.url, current.minecraftVersion));
+    } else {
+        dialog->setSuggestedPack(current.name, selectedVersion,
+                                 new Technic::SolderPackInstallTask(APPLICATION->network(), current.url, current.slug, selectedVersion,
+                                                                    current.minecraftVersion));
     }
 }
 
-void TechnicPage::onSolderLoaded() {
+void TechnicPage::onSolderLoaded()
+{
     jobPtr.reset();
 
     auto fallback = [this]() {
@@ -319,12 +306,13 @@ void TechnicPage::onSolderLoaded() {
     metadataLoaded();
 }
 
-void TechnicPage::onVersionSelectionChanged(QString data) {
-    if (data.isNull() || data.isEmpty()) {
+void TechnicPage::onVersionSelectionChanged(QString version)
+{
+    if (version.isNull() || version.isEmpty()) {
         selectedVersion = "";
         return;
     }
 
-    selectedVersion = data;
+    selectedVersion = version;
     selectVersion();
 }
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.h b/launcher/ui/pages/modplatform/technic/TechnicPage.h
index 753261b3..91b61eaf 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.h
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2021-2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -37,46 +37,32 @@
 
 #include <QWidget>
 
-#include "ui/pages/BasePage.h"
 #include <Application.h>
+#include "TechnicData.h"
 #include "net/NetJob.h"
 #include "tasks/Task.h"
-#include "TechnicData.h"
+#include "ui/pages/BasePage.h"
 
-namespace Ui
-{
+namespace Ui {
 class TechnicPage;
 }
 
 class NewInstanceDialog;
 
 namespace Technic {
-    class ListModel;
+class ListModel;
 }
 
-class TechnicPage : public QWidget, public BasePage
-{
+class TechnicPage : public QWidget, public BasePage {
     Q_OBJECT
 
-public:
-    explicit TechnicPage(NewInstanceDialog* dialog, QWidget *parent = 0);
+   public:
+    explicit TechnicPage(NewInstanceDialog* dialog, QWidget* parent = 0);
     virtual ~TechnicPage();
-    virtual QString displayName() const override
-    {
-        return "Technic";
-    }
-    virtual QIcon icon() const override
-    {
-        return APPLICATION->getThemedIcon("technic");
-    }
-    virtual QString id() const override
-    {
-        return "technic";
-    }
-    virtual QString helpPage() const override
-    {
-        return "Technic-platform";
-    }
+    virtual QString displayName() const override { return "Technic"; }
+    virtual QIcon icon() const override { return APPLICATION->getThemedIcon("technic"); }
+    virtual QString id() const override { return "technic"; }
+    virtual QString helpPage() const override { return "Technic-platform"; }
     virtual bool shouldDisplay() const override;
     void retranslate() override;
 
@@ -84,19 +70,19 @@ public:
 
     bool eventFilter(QObject* watched, QEvent* event) override;
 
-private:
+   private:
     void suggestCurrent();
     void metadataLoaded();
     void selectVersion();
 
-private slots:
+   private slots:
     void triggerSearch();
     void onSelectionChanged(QModelIndex first, QModelIndex second);
     void onSolderLoaded();
     void onVersionSelectionChanged(QString data);
 
-private:
-    Ui::TechnicPage *ui = nullptr;
+   private:
+    Ui::TechnicPage* ui = nullptr;
     NewInstanceDialog* dialog = nullptr;
     Technic::ListModel* model = nullptr;