0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: use function cb instead of class cb in getVersions

Browse Source 
I've discovered even more functional programming! :^)

Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow 2022-07-18 19:22:31 -03:00
parent 5bc67d3f6b
commit 6f052baa94
No known key found for this signature in database
GPG Key ID: 8D0F221F0A59F469
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/modplatform/ModAPI.h
View File

@ -85,7 +85,7 @@ class ModAPI {
ModLoaderTypes loaders; ModLoaderTypes loaders;
}; };
virtual void getVersions(CallerType* caller, VersionSearchArgs&& args) const = 0; virtual void getVersions(VersionSearchArgs&& args, std::function<void(QJsonDocument&, QString)> callback) const = 0;
static auto getModLoaderString(ModLoaderType type) -> const QString { static auto getModLoaderString(ModLoaderType type) -> const QString {
switch (type) { switch (type) {

12
launcher/modplatform/helpers/NetworkModAPI.cpp
View File

@ -52,27 +52,27 @@ void NetworkModAPI::getModInfo(ModPlatform::IndexedPack& pack, std::function<voi
job->start(); job->start();
} }
void NetworkModAPI::getVersions(CallerType* caller, VersionSearchArgs&& args) const void NetworkModAPI::getVersions(VersionSearchArgs&& args, std::function<void(QJsonDocument&, QString)> callback) const
{ {
auto netJob = new NetJob(QString("%1::ModVersions(%2)").arg(caller->debugName()).arg(args.addonId), APPLICATION->network()); auto netJob = new NetJob(QString("ModVersions(%2)").arg(args.addonId), APPLICATION->network());
auto response = new QByteArray(); auto response = new QByteArray();
netJob->addNetAction(Net::Download::makeByteArray(getVersionsURL(args), response)); netJob->addNetAction(Net::Download::makeByteArray(getVersionsURL(args), response));
QObject::connect(netJob, &NetJob::succeeded, caller, [response, caller, args] { QObject::connect(netJob, &NetJob::succeeded, [response, callback, args] {
QJsonParseError parse_error{}; QJsonParseError parse_error{};
QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error); QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
if (parse_error.error != QJsonParseError::NoError) { if (parse_error.error != QJsonParseError::NoError) {
qWarning() << "Error while parsing JSON response from " << caller->debugName() << " at " << parse_error.offset qWarning() << "Error while parsing JSON response for getting versions at " << parse_error.offset
<< " reason: " << parse_error.errorString(); << " reason: " << parse_error.errorString();
qWarning() << *response; qWarning() << *response;
return; return;
} }
caller->versionRequestSucceeded(doc, args.addonId); callback(doc, args.addonId);
}); });
QObject::connect(netJob, &NetJob::finished, caller, [response, netJob] { QObject::connect(netJob, &NetJob::finished, [response, netJob] {
netJob->deleteLater(); netJob->deleteLater();
delete response; delete response;
}); });

2
launcher/modplatform/helpers/NetworkModAPI.h
View File

@ -6,7 +6,7 @@ class NetworkModAPI : public ModAPI {
public: public:
void searchMods(CallerType* caller, SearchArgs&& args) const override; void searchMods(CallerType* caller, SearchArgs&& args) const override;
void getModInfo(ModPlatform::IndexedPack& pack, std::function<void(QJsonDocument&, ModPlatform::IndexedPack&)> callback) override; void getModInfo(ModPlatform::IndexedPack& pack, std::function<void(QJsonDocument&, ModPlatform::IndexedPack&)> callback) override;
void getVersions(CallerType* caller, VersionSearchArgs&& args) const override; void getVersions(VersionSearchArgs&& args, std::function<void(QJsonDocument&, QString)> callback) const override;
auto getProject(QString addonId, QByteArray* response) const -> NetJob* override; auto getProject(QString addonId, QByteArray* response) const -> NetJob* override;

3
launcher/ui/pages/modplatform/ModModel.cpp
View File

@ -100,7 +100,8 @@ void ListModel::requestModVersions(ModPlatform::IndexedPack const& current)
{ {
auto profile = (dynamic_cast<MinecraftInstance*>((dynamic_cast<ModPage*>(parent()))->m_instance))->getPackProfile(); auto profile = (dynamic_cast<MinecraftInstance*>((dynamic_cast<ModPage*>(parent()))->m_instance))->getPackProfile();
m_parent->apiProvider()->getVersions(this, { current.addonId.toString(), getMineVersions(), profile->getModLoaders() }); m_parent->apiProvider()->getVersions({ current.addonId.toString(), getMineVersions(), profile->getModLoaders() },
[this, current](QJsonDocument& doc, QString addonId) { versionRequestSucceeded(doc, addonId); });
} }
void ListModel::performPaginatedSearch() void ListModel::performPaginatedSearch()