Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class

2 files changed, 37 insertions, 57 deletions

diff --git a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
index 320ddd3e..e5ad8244 100644
--- a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
@@ -53,11 +53,11 @@ void PackFetchTask::fetch()
 
     QUrl publicPacksUrl = QUrl(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/modpacks.xml");
     qDebug() << "Downloading public version info from" << publicPacksUrl.toString();
-    jobPtr->addNetAction(Net::ApiDownload::makeByteArray(publicPacksUrl, &publicModpacksXmlFileData));
+    jobPtr->addNetAction(Net::ApiDownload::makeByteArray(publicPacksUrl, publicModpacksXmlFileData));
 
     QUrl thirdPartyUrl = QUrl(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/thirdparty.xml");
     qDebug() << "Downloading thirdparty version info from" << thirdPartyUrl.toString();
-    jobPtr->addNetAction(Net::ApiDownload::makeByteArray(thirdPartyUrl, &thirdPartyModpacksXmlFileData));
+    jobPtr->addNetAction(Net::Download::makeByteArray(thirdPartyUrl, thirdPartyModpacksXmlFileData));
 
     QObject::connect(jobPtr.get(), &NetJob::succeeded, this, &PackFetchTask::fileDownloadFinished);
     QObject::connect(jobPtr.get(), &NetJob::failed, this, &PackFetchTask::fileDownloadFailed);
@@ -66,22 +66,19 @@ void PackFetchTask::fetch()
     jobPtr->start();
 }
 
-void PackFetchTask::fetchPrivate(const QStringList & toFetch)
+void PackFetchTask::fetchPrivate(const QStringList& toFetch)
 {
     QString privatePackBaseUrl = BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/%1.xml";
 
-    for (auto &packCode: toFetch)
-    {
-        QByteArray *data = new QByteArray();
-        NetJob *job = new NetJob("Fetching private pack", m_network);
+    for (auto& packCode : toFetch) {
+        auto data = std::make_shared<QByteArray>();
+        NetJob* job = new NetJob("Fetching private pack", m_network);
         job->addNetAction(Net::ApiDownload::makeByteArray(privatePackBaseUrl.arg(packCode), data));
 
-        QObject::connect(job, &NetJob::succeeded, this, [this, job, data, packCode]
-        {
+        QObject::connect(job, &NetJob::succeeded, this, [this, job, data, packCode] {
             ModpackList packs;
             parseAndAddPacks(*data, PackType::Private, packs);
-            foreach(Modpack currentPack, packs)
-            {
+            foreach (Modpack currentPack, packs) {
                 currentPack.packCode = packCode;
                 emit privateFileDownloadFinished(currentPack);
             }
@@ -89,24 +86,20 @@ void PackFetchTask::fetchPrivate(const QStringList & toFetch)
             job->deleteLater();
 
             data->clear();
-            delete data;
         });
 
-        QObject::connect(job, &NetJob::failed, this, [this, job, packCode, data](QString reason)
-        {
+        QObject::connect(job, &NetJob::failed, this, [this, job, packCode, data](QString reason) {
             emit privateFileDownloadFailed(reason, packCode);
             job->deleteLater();
 
             data->clear();
-            delete data;
         });
 
-        QObject::connect(job, &NetJob::aborted, this, [this, job, data]{
+        QObject::connect(job, &NetJob::aborted, this, [this, job, data] {
             emit aborted();
             job->deleteLater();
 
             data->clear();
-            delete data;
         });
 
         job->start();
@@ -119,27 +112,22 @@ void PackFetchTask::fileDownloadFinished()
 
     QStringList failedLists;
 
-    if(!parseAndAddPacks(publicModpacksXmlFileData, PackType::Public, publicPacks))
-    {
+    if (!parseAndAddPacks(*publicModpacksXmlFileData, PackType::Public, publicPacks)) {
         failedLists.append(tr("Public Packs"));
     }
 
-    if(!parseAndAddPacks(thirdPartyModpacksXmlFileData, PackType::ThirdParty, thirdPartyPacks))
-    {
+    if (!parseAndAddPacks(*thirdPartyModpacksXmlFileData, PackType::ThirdParty, thirdPartyPacks)) {
         failedLists.append(tr("Third Party Packs"));
     }
 
-    if(failedLists.size() > 0)
-    {
+    if (failedLists.size() > 0) {
         emit failed(tr("Failed to download some pack lists: %1").arg(failedLists.join("\n- ")));
-    }
-    else
-    {
+    } else {
         emit finished(publicPacks, thirdPartyPacks);
     }
 }
 
-bool PackFetchTask::parseAndAddPacks(QByteArray &data, PackType packType, ModpackList &list)
+bool PackFetchTask::parseAndAddPacks(QByteArray& data, PackType packType, ModpackList& list)
 {
     QDomDocument doc;
 
@@ -147,8 +135,7 @@ bool PackFetchTask::parseAndAddPacks(QByteArray &data, PackType packType, Modpac
     int errorLine = -1;
     int errorCol = -1;
 
-    if(!doc.setContent(data, false, &errorMsg, &errorLine, &errorCol))
-    {
+    if (!doc.setContent(data, false, &errorMsg, &errorLine, &errorCol)) {
         auto fullErrMsg = QString("Failed to fetch modpack data: %1 %2:%3!").arg(errorMsg).arg(errorLine).arg(errorCol);
         qWarning() << fullErrMsg;
         data.clear();
@@ -156,8 +143,7 @@ bool PackFetchTask::parseAndAddPacks(QByteArray &data, PackType packType, Modpac
     }
 
     QDomNodeList nodes = doc.elementsByTagName("modpack");
-    for(int i = 0; i < nodes.length(); i++)
-    {
+    for (int i = 0; i < nodes.length(); i++) {
         QDomElement element = nodes.at(i).toElement();
 
         Modpack modpack;
@@ -171,26 +157,20 @@ bool PackFetchTask::parseAndAddPacks(QByteArray &data, PackType packType, Modpac
         modpack.broken = false;
         modpack.bugged = false;
 
-        //remove empty if the xml is bugged
-        for(QString curr : modpack.oldVersions)
-        {
-            if(curr.isNull() || curr.isEmpty())
-            {
+        // 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())
-            {
+        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
-            {
+            } else {
                 modpack.broken = true;
                 qWarning() << "Broken pack:" << modpack.name << " => No valid version!";
             }
@@ -220,4 +200,4 @@ void PackFetchTask::fileDownloadAborted()
     emit aborted();
 }
 
-}
+}  // namespace LegacyFTB
diff --git a/launcher/modplatform/legacy_ftb/PackFetchTask.h b/launcher/modplatform/legacy_ftb/PackFetchTask.h
index 8f3c4f3b..f2116ce9 100644
--- a/launcher/modplatform/legacy_ftb/PackFetchTask.h
+++ b/launcher/modplatform/legacy_ftb/PackFetchTask.h
@@ -1,41 +1,41 @@
 #pragma once
 
-#include "net/NetJob.h"
-#include <QTemporaryDir>
 #include <QByteArray>
 #include <QObject>
+#include <QTemporaryDir>
+#include <memory>
 #include "PackHelpers.h"
+#include "net/NetJob.h"
 
 namespace LegacyFTB {
 
 class PackFetchTask : public QObject {
-
     Q_OBJECT
 
-public:
-    PackFetchTask(shared_qobject_ptr<QNetworkAccessManager> network) : QObject(nullptr), m_network(network) {};
+   public:
+    PackFetchTask(shared_qobject_ptr<QNetworkAccessManager> network) : QObject(nullptr), m_network(network){};
     virtual ~PackFetchTask() = default;
 
     void fetch();
-    void fetchPrivate(const QStringList &toFetch);
+    void fetchPrivate(const QStringList& toFetch);
 
-private:
+   private:
     shared_qobject_ptr<QNetworkAccessManager> m_network;
     NetJob::Ptr jobPtr;
 
-    QByteArray publicModpacksXmlFileData;
-    QByteArray thirdPartyModpacksXmlFileData;
+    std::shared_ptr<QByteArray> publicModpacksXmlFileData = std::make_shared<QByteArray>();
+    std::shared_ptr<QByteArray> thirdPartyModpacksXmlFileData = std::make_shared<QByteArray>();
 
-    bool parseAndAddPacks(QByteArray &data, PackType packType, ModpackList &list);
+    bool parseAndAddPacks(QByteArray& data, PackType packType, ModpackList& list);
     ModpackList publicPacks;
     ModpackList thirdPartyPacks;
 
-protected slots:
+   protected slots:
     void fileDownloadFinished();
     void fileDownloadFailed(QString reason);
     void fileDownloadAborted();
 
-signals:
+   signals:
     void finished(ModpackList publicPacks, ModpackList thirdPartyPacks);
     void failed(QString reason);
     void aborted();
@@ -44,4 +44,4 @@ signals:
     void privateFileDownloadFailed(QString reason, QString packCode);
 };
 
-}
+}  // namespace LegacyFTB