aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/pages/modplatform
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/ui/pages/modplatform')
-rw-r--r--launcher/ui/pages/modplatform/ModModel.cpp20
-rw-r--r--launcher/ui/pages/modplatform/ModModel.h7
-rw-r--r--launcher/ui/pages/modplatform/ModPage.cpp9
-rw-r--r--launcher/ui/pages/modplatform/ModPage.h2
-rw-r--r--launcher/ui/pages/modplatform/flame/FlameModModel.cpp43
-rw-r--r--launcher/ui/pages/modplatform/flame/FlameModModel.h4
-rw-r--r--launcher/ui/pages/modplatform/flame/FlameModPage.h6
-rw-r--r--launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp39
-rw-r--r--launcher/ui/pages/modplatform/modrinth/ModrinthModel.h4
-rw-r--r--launcher/ui/pages/modplatform/modrinth/ModrinthPage.h6
10 files changed, 62 insertions, 78 deletions
diff --git a/launcher/ui/pages/modplatform/ModModel.cpp b/launcher/ui/pages/modplatform/ModModel.cpp
index 5bd7e33e..481f1c56 100644
--- a/launcher/ui/pages/modplatform/ModModel.cpp
+++ b/launcher/ui/pages/modplatform/ModModel.cpp
@@ -1,6 +1,8 @@
#include "ModModel.h"
#include "ModPage.h"
+#include "minecraft/MinecraftInstance.h"
+#include "minecraft/PackProfile.h"
#include "ui/dialogs/ModDownloadDialog.h"
#include <QMessageBox>
@@ -95,6 +97,24 @@ void ListModel::getLogo(const QString& logo, const QString& logoUrl, LogoCallbac
}
}
+void ListModel::performPaginatedSearch()
+{
+ QString mcVersion = ((MinecraftInstance*)((ModPage*)parent())->m_instance)->getPackProfile()->getComponentVersion("net.minecraft");
+ bool hasFabric = !((MinecraftInstance*)((ModPage*)parent())->m_instance)
+ ->getPackProfile()
+ ->getComponentVersion("net.fabricmc.fabric-loader")
+ .isEmpty();
+ auto netJob = new NetJob(QString("%1::Search").arg(m_parent->debugName()), APPLICATION->network());
+ auto searchUrl = m_parent->apiProvider()->getModSearchURL(nextSearchOffset, currentSearchTerm, getSorts()[currentSort], hasFabric, mcVersion);
+
+ netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
+ jobPtr = netJob;
+ jobPtr->start();
+
+ QObject::connect(netJob, &NetJob::succeeded, this, &ListModel::searchRequestFinished);
+ QObject::connect(netJob, &NetJob::failed, this, &ListModel::searchRequestFailed);
+}
+
void ListModel::searchWithTerm(const QString& term, const int sort)
{
if (currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull() && currentSort == sort) { return; }
diff --git a/launcher/ui/pages/modplatform/ModModel.h b/launcher/ui/pages/modplatform/ModModel.h
index ae8ceb7c..23e544f1 100644
--- a/launcher/ui/pages/modplatform/ModModel.h
+++ b/launcher/ui/pages/modplatform/ModModel.h
@@ -3,6 +3,7 @@
#include <QAbstractListModel>
#include "modplatform/ModIndex.h"
+#include "modplatform/ModAPI.h"
#include "net/NetJob.h"
class ModPage;
@@ -30,15 +31,18 @@ class ListModel : public QAbstractListModel {
void searchWithTerm(const QString& term, const int sort);
protected slots:
- virtual void performPaginatedSearch() = 0;
virtual void searchRequestFinished() = 0;
+ void performPaginatedSearch();
+
void logoFailed(QString logo);
void logoLoaded(QString logo, QIcon out);
void searchRequestFailed(QString reason);
protected:
+ virtual const char** getSorts() const = 0;
+
void requestLogo(QString file, QString url);
protected:
@@ -56,5 +60,6 @@ class ListModel : public QAbstractListModel {
enum SearchState { None, CanPossiblyFetchMore, ResetRequested, Finished } searchState = None;
NetJob::Ptr jobPtr;
QByteArray response;
+
};
} // namespace ModPlatform
diff --git a/launcher/ui/pages/modplatform/ModPage.cpp b/launcher/ui/pages/modplatform/ModPage.cpp
index 8af534a6..2d47e31c 100644
--- a/launcher/ui/pages/modplatform/ModPage.cpp
+++ b/launcher/ui/pages/modplatform/ModPage.cpp
@@ -101,13 +101,8 @@ void ModPage::onSelectionChanged(QModelIndex first, QModelIndex second)
auto netJob = new NetJob(QString("%1::ModVersions(%2)").arg(debugName()).arg(current.name), APPLICATION->network());
auto response = new QByteArray();
QString addonId = current.addonId.toString();
- //FIXME
- if(debugName() == "Modrinth")
- netJob->addNetAction(
- Net::Download::makeByteArray(QString("https://api.modrinth.com/v2/project/%1/version").arg(addonId), response));
- else
- netJob->addNetAction(
- Net::Download::makeByteArray(QString("https://addons-ecs.forgesvc.net/api/v2/addon/%1/files").arg(addonId), response));
+
+ netJob->addNetAction(Net::Download::makeByteArray(apiProvider()->getVersionsURL(addonId), response));
QObject::connect(netJob, &NetJob::succeeded, this, [this, response, addonId]{
onModVersionSucceed(this, response, addonId);
diff --git a/launcher/ui/pages/modplatform/ModPage.h b/launcher/ui/pages/modplatform/ModPage.h
index c0102549..4657bc5e 100644
--- a/launcher/ui/pages/modplatform/ModPage.h
+++ b/launcher/ui/pages/modplatform/ModPage.h
@@ -3,6 +3,7 @@
#include <Application.h>
#include <QWidget>
+#include "modplatform/ModAPI.h"
#include "modplatform/ModIndex.h"
#include "tasks/Task.h"
#include "ui/pages/BasePage.h"
@@ -30,6 +31,7 @@ class ModPage : public QWidget, public BasePage {
inline virtual QString metaEntryBase() const = 0;
virtual bool shouldDisplay() const override = 0;
+ virtual const ModAPI* apiProvider() const = 0;
void openedImpl() override;
bool eventFilter(QObject* watched, QEvent* event) override;
diff --git a/launcher/ui/pages/modplatform/flame/FlameModModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModModel.cpp
index 5ab6672f..283f9ce7 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModModel.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModModel.cpp
@@ -1,6 +1,5 @@
#include "FlameModModel.h"
#include "FlameModPage.h"
-#include "minecraft/MinecraftInstance.h"
#include "minecraft/PackProfile.h"
#include <Json.h>
@@ -11,41 +10,6 @@ ListModel::ListModel(FlameModPage* parent) : ModPlatform::ListModel(parent) {}
ListModel::~ListModel() {}
-const char* sorts[6]{ "Featured", "Popularity", "LastUpdated", "Name", "Author", "TotalDownloads" };
-
-void ListModel::performPaginatedSearch()
-{
- QString mcVersion = ((MinecraftInstance*)((FlameModPage*)parent())->m_instance)->getPackProfile()->getComponentVersion("net.minecraft");
- bool hasFabric = !((MinecraftInstance*)((FlameModPage*)parent())->m_instance)
- ->getPackProfile()
- ->getComponentVersion("net.fabricmc.fabric-loader")
- .isEmpty();
- auto netJob = new NetJob("Flame::Search", APPLICATION->network());
- auto searchUrl = QString(
- "https://addons-ecs.forgesvc.net/api/v2/addon/search?"
- "gameId=432&"
- "categoryId=0&"
- "sectionId=6&"
-
- "index=%1&"
- "pageSize=25&"
- "searchFilter=%2&"
- "sort=%3&"
- "modLoaderType=%4&"
- "gameVersion=%5")
- .arg(nextSearchOffset)
- .arg(currentSearchTerm)
- .arg(sorts[currentSort])
- .arg(hasFabric ? 4 : 1) // Enum: https://docs.curseforge.com/?http#tocS_ModLoaderType
- .arg(mcVersion);
-
- netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
- jobPtr = netJob;
- jobPtr->start();
-
- QObject::connect(netJob, &NetJob::succeeded, this, &FlameMod::ListModel::searchRequestFinished);
- QObject::connect(netJob, &NetJob::failed, this, &ListModel::searchRequestFailed);
-}
void FlameMod::ListModel::searchRequestFinished()
{
@@ -87,4 +51,11 @@ void FlameMod::ListModel::searchRequestFinished()
endInsertRows();
}
+const char* sorts[6]{ "Featured", "Popularity", "LastUpdated", "Name", "Author", "TotalDownloads" };
+
+const char** FlameMod::ListModel::getSorts() const
+{
+ return sorts;
+}
+
} // namespace FlameMod
diff --git a/launcher/ui/pages/modplatform/flame/FlameModModel.h b/launcher/ui/pages/modplatform/flame/FlameModModel.h
index a585331d..ae919e63 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModModel.h
+++ b/launcher/ui/pages/modplatform/flame/FlameModModel.h
@@ -30,8 +30,10 @@ class ListModel : public ModPlatform::ListModel {
virtual ~ListModel();
private slots:
- void performPaginatedSearch() override;
void searchRequestFinished() override;
+
+ private:
+ const char** getSorts() const override;
};
} // namespace Modrinth
diff --git a/launcher/ui/pages/modplatform/flame/FlameModPage.h b/launcher/ui/pages/modplatform/flame/FlameModPage.h
index 2daa155f..e7d98cb0 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModPage.h
+++ b/launcher/ui/pages/modplatform/flame/FlameModPage.h
@@ -2,6 +2,8 @@
#include "ui/pages/modplatform/ModPage.h"
+#include "modplatform/flame/FlameAPI.h"
+
class FlameModPage : public ModPage {
Q_OBJECT
@@ -18,7 +20,11 @@ class FlameModPage : public ModPage {
inline QString metaEntryBase() const override { return "FlameMods"; };
bool shouldDisplay() const override;
+ const ModAPI* apiProvider() const override { return &api; };
private:
void onModVersionSucceed(ModPage*, QByteArray*, QString) override;
+
+ private:
+ FlameAPI api;
};
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index d2e86ef8..dc3d1469 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -1,7 +1,6 @@
#include "ModrinthModel.h"
#include "ModrinthPage.h"
#include "minecraft/MinecraftInstance.h"
-#include "minecraft/PackProfile.h"
#include <Json.h>
@@ -11,37 +10,6 @@ ListModel::ListModel(ModrinthPage* parent) : ModPlatform::ListModel(parent) {}
ListModel::~ListModel() {}
-const char* sorts[5]{ "relevance", "downloads", "follows", "updated", "newest" };
-
-void ListModel::performPaginatedSearch()
-{
- QString mcVersion = ((MinecraftInstance*)((ModrinthPage*)parent())->m_instance)->getPackProfile()->getComponentVersion("net.minecraft");
- bool hasFabric = !((MinecraftInstance*)((ModrinthPage*)parent())->m_instance)
- ->getPackProfile()
- ->getComponentVersion("net.fabricmc.fabric-loader")
- .isEmpty();
- auto netJob = new NetJob("Modrinth::Search", APPLICATION->network());
- auto searchUrl = QString(
- "https://api.modrinth.com/v2/search?"
- "offset=%1&"
- "limit=25&"
- "query=%2&"
- "index=%3&"
- "facets=[[\"categories:%4\"],[\"versions:%5\"],[\"project_type:mod\"]]")
- .arg(nextSearchOffset)
- .arg(currentSearchTerm)
- .arg(sorts[currentSort])
- .arg(hasFabric ? "fabric" : "forge")
- .arg(mcVersion);
-
- netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
- jobPtr = netJob;
- jobPtr->start();
-
- QObject::connect(netJob, &NetJob::succeeded, this, &Modrinth::ListModel::searchRequestFinished);
- QObject::connect(netJob, &NetJob::failed, this, &ListModel::searchRequestFailed);
-}
-
void Modrinth::ListModel::searchRequestFinished()
{
jobPtr.reset();
@@ -80,4 +48,11 @@ void Modrinth::ListModel::searchRequestFinished()
endInsertRows();
}
+const char* sorts[5]{ "relevance", "downloads", "follows", "updated", "newest" };
+
+const char** Modrinth::ListModel::getSorts() const
+{
+ return sorts;
+}
+
} // namespace Modrinth
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
index 73492356..b8937b50 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
@@ -30,8 +30,10 @@ class ListModel : public ModPlatform::ListModel {
virtual ~ListModel();
private slots:
- void performPaginatedSearch() override;
void searchRequestFinished() override;
+
+ private:
+ const char** getSorts() const override;
};
} // namespace Modrinth
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
index 41c6c31d..504f42ad 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
@@ -2,6 +2,8 @@
#include "ui/pages/modplatform/ModPage.h"
+#include "modplatform/modrinth/ModrinthAPI.h"
+
class ModrinthPage : public ModPage {
Q_OBJECT
@@ -18,7 +20,11 @@ class ModrinthPage : public ModPage {
inline QString metaEntryBase() const override { return "ModrinthPacks"; };
bool shouldDisplay() const override;
+ const ModAPI* apiProvider() const override { return &api; };
private:
void onModVersionSucceed(ModPage*, QByteArray*, QString) override;
+
+ private:
+ ModrinthAPI api;
};
generated by cgit (git 2.46.0) at 2025-02-03 07:03:23 +0000