aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/pages/modplatform
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-04-20 00:57:09 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-04-21 18:42:06 +0300
commitc1490cd62703975c5478aea1156d0bbefcc37bc8 (patch)
treeda80b7277cea57dabe6692d58e07b4adfcfbfb16 /launcher/ui/pages/modplatform
parentfac33498dbd50fd9af60164e786534615586d6ac (diff)
downloadPrismLauncher-c1490cd62703975c5478aea1156d0bbefcc37bc8.tar.gz
PrismLauncher-c1490cd62703975c5478aea1156d0bbefcc37bc8.tar.bz2
PrismLauncher-c1490cd62703975c5478aea1156d0bbefcc37bc8.zip
Refator task to work with multiple providers
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/ui/pages/modplatform')
-rw-r--r--launcher/ui/pages/modplatform/ResourceModel.cpp42
-rw-r--r--launcher/ui/pages/modplatform/ResourceModel.h2
-rw-r--r--launcher/ui/pages/modplatform/ResourcePage.cpp5
-rw-r--r--launcher/ui/pages/modplatform/ResourcePage.h2
4 files changed, 0 insertions, 51 deletions
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
index c1746d41..97b9efa9 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -449,46 +449,4 @@ void ResourceModel::infoRequestSucceeded(QJsonDocument& doc, ModPlatform::Indexe
emit projectInfoUpdated();
}
-QList<ModPlatform::IndexedVersion> ResourceModel::getDependecies(QDir& dir, QList<ModPlatform::IndexedVersion> selected)
-{
- auto task = std::make_unique<GetModDependenciesTask>(
- dir, selected,
- [this](const ModPlatform::Dependency& dependency, std::function<void(const ModPlatform::IndexedVersion&)> succeeded) -> Task::Ptr {
- auto args{ createDependecyArguments(dependency) };
- auto callbacks{ createDependecyCallbacks() };
-
- // Use default if no callbacks are set
- if (!callbacks.on_succeed)
- callbacks.on_succeed = [this, dependency, succeeded](auto& doc, auto& pack) {
- ModPlatform::IndexedVersion ver;
- try {
- QJsonArray arr;
- if (dependency.version.length() != 0 && doc.isObject()) {
- arr.append(doc.object());
- } else {
- arr = doc.isObject() ? Json::ensureArray(doc.object(), "data") : doc.array();
- }
- ver = loadDependencyVersions(dependency, arr);
- if (!ver.addonId.isValid()) {
- qWarning() << "Error while reading " << debugName() << " resource version empty ";
- qDebug() << doc;
- return;
- }
- } catch (const JSONValidationError& e) {
- qDebug() << doc;
- qWarning() << "Error while reading " << debugName() << " resource version: " << e.cause();
- return;
- }
-
- succeeded(ver);
- };
-
- return m_api->getDependencyVersion(std::move(args), std::move(callbacks));
- });
-
- task->start();
-
- return task->getDependecies();
-};
-
} // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ResourceModel.h b/launcher/ui/pages/modplatform/ResourceModel.h
index 3b1f4748..3ea567af 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.h
+++ b/launcher/ui/pages/modplatform/ResourceModel.h
@@ -85,8 +85,6 @@ class ResourceModel : public QAbstractListModel {
/** Gets the icon at the URL for the given index. If it's not fetched yet, fetch it and update when fisinhed. */
std::optional<QIcon> getIcon(QModelIndex&, const QUrl&);
- QList<ModPlatform::IndexedVersion> getDependecies(QDir& dir, QList<ModPlatform::IndexedVersion> m_selected);
-
protected:
/** Resets the model's data. */
void clearData();
diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp
index 02412fd9..1baa24ee 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePage.cpp
@@ -405,9 +405,4 @@ void ResourcePage::openUrl(const QUrl& url)
QDesktopServices::openUrl(url);
}
-QList<ModPlatform::IndexedVersion> ResourcePage::getDependecies(QDir& dir, QList<ModPlatform::IndexedVersion> selected)
-{
- return m_model->getDependecies(dir, selected);
-};
-
} // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ResourcePage.h b/launcher/ui/pages/modplatform/ResourcePage.h
index 4fffd506..a8299728 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.h
+++ b/launcher/ui/pages/modplatform/ResourcePage.h
@@ -75,8 +75,6 @@ class ResourcePage : public QWidget, public BasePage {
virtual void addResourceToDialog(ModPlatform::IndexedPack&, ModPlatform::IndexedVersion&);
virtual void removeResourceFromDialog(ModPlatform::IndexedPack&, ModPlatform::IndexedVersion&);
- QList<ModPlatform::IndexedVersion> getDependecies(QDir& dir, QList<ModPlatform::IndexedVersion> m_selected);
-
protected slots:
virtual void triggerSearch() {}