diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-15 10:36:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-15 10:36:09 +0200 |
| commit | 4b06255cc26933379107745d95f72097737d2a9b (patch) | |
| tree | 60e00c8389bb2d8e4be492531beb788a253d1b6a /launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp | |
| parent | 3aba7f8fec45c7c87be486d8f6b5c96f69facf93 (diff) | |
| parent | 1939e3e6ed3d2d2d4199d90154333cc8892eafeb (diff) | |
| download | PrismLauncher-4b06255cc26933379107745d95f72097737d2a9b.tar.gz PrismLauncher-4b06255cc26933379107745d95f72097737d2a9b.tar.bz2 PrismLauncher-4b06255cc26933379107745d95f72097737d2a9b.zip | |
Merge pull request #1486 from PrismLauncher/staging
Diffstat (limited to 'launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp')
| -rw-r--r-- | launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp index c6b087d6..39f4f346 100644 --- a/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp +++ b/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp @@ -20,6 +20,8 @@ #include <BuildConfig.h> #include <Json.h> +#include "net/ApiDownload.h" + namespace Atl { ListModel::ListModel(QObject* parent) : QAbstractListModel(parent) {} @@ -75,7 +77,7 @@ void ListModel::request() auto netJob = makeShared<NetJob>("Atl::Request", APPLICATION->network()); auto url = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "launcher/json/packsnew.json"); - netJob->addNetAction(Net::Download::makeByteArray(QUrl(url), response)); + netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(url), response)); jobPtr = netJob; jobPtr->start(); @@ -137,8 +139,7 @@ void ListModel::requestFailed(QString reason) void ListModel::getLogo(const QString& logo, const QString& logoUrl, LogoCallback callback) { if (m_logoMap.contains(logo)) { - callback( - APPLICATION->metacache()->resolveEntry("ATLauncherPacks", QString("logos/%1").arg(logo.section(".", 0, 0)))->getFullPath()); + callback(APPLICATION->metacache()->resolveEntry("ATLauncherPacks", QString("logos/%1").arg(logo))->getFullPath()); } else { requestLogo(logo, logoUrl); } @@ -168,9 +169,9 @@ void ListModel::requestLogo(QString file, QString url) return; } - MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("ATLauncherPacks", QString("logos/%1").arg(file.section(".", 0, 0))); + MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("ATLauncherPacks", QString("logos/%1").arg(file)); auto job = new NetJob(QString("ATLauncher Icon Download %1").arg(file), APPLICATION->network()); - job->addNetAction(Net::Download::makeCached(QUrl(url), entry)); + job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry)); auto fullPath = entry->getFullPath(); QObject::connect(job, &NetJob::succeeded, this, [this, file, fullPath, job] { |