Small cleanup

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

launcher/minecraft/mod/MetadataHandler.h

@@ -51,6 +51,4 @@ class Metadata {
     static auto get(QDir& index_dir, QString mod_slug) -> ModStruct { return Packwiz::V1::getIndexForMod(index_dir, mod_slug); }
 
     static auto get(QDir& index_dir, QVariant& mod_id) -> ModStruct { return Packwiz::V1::getIndexForMod(index_dir, mod_id); }
-
-    static auto getAll(QDir& index_dir) -> QList<ModStruct> { return Packwiz::V1::getAllMods(index_dir); }
 };

launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp

@@ -48,12 +48,15 @@ GetModDependenciesTask::GetModDependenciesTask(QObject* parent,
                                                BaseInstance* instance,
                                                ModFolderModel* folder,
                                                QList<std::shared_ptr<PackDependecny>> selected)
-    : SequentialTask(parent, "Get dependencies"), m_selected(selected), m_version(mcVersions(instance)), m_loaderType(mcLoaders(instance))
+    : SequentialTask(parent, "Get dependencies")
+    , m_selected(selected)
+    , m_flame_provider{ ModPlatform::ResourceProvider::FLAME, std::make_shared<ResourceDownload::FlameModModel>(*instance),
+                        std::make_shared<FlameAPI>() }
+    , m_modrinth_provider{ ModPlatform::ResourceProvider::MODRINTH, std::make_shared<ResourceDownload::ModrinthModModel>(*instance),
+                           std::make_shared<ModrinthAPI>() }
+    , m_version(mcVersions(instance))
+    , m_loaderType(mcLoaders(instance))
 {
-    m_providers.append(Provider{ ModPlatform::ResourceProvider::FLAME, std::make_shared<ResourceDownload::FlameModModel>(*instance),
-                                 std::make_shared<FlameAPI>() });
-    m_providers.append(Provider{ ModPlatform::ResourceProvider::MODRINTH, std::make_shared<ResourceDownload::ModrinthModModel>(*instance),
-                                 std::make_shared<ModrinthAPI>() });
     for (auto mod : folder->allMods())
         m_mods.append(mod->metadata());
     prepare();
@@ -104,17 +107,12 @@ Task::Ptr GetModDependenciesTask::prepareDependencyTask(const ModPlatform::Depen
     pDep->dependency = dep;
     pDep->pack = { dep.addonId, providerName };
     m_pack_dependencies.append(pDep);
-    auto provider =
+    auto provider = providerName == m_flame_provider.name ? m_flame_provider : m_modrinth_provider;
-        std::find_if(m_providers.begin(), m_providers.end(), [providerName](const Provider& p) { return p.name == providerName; });
-    // if (provider == m_providers.end()) {
-    //     qWarning() << "Unsuported provider for dependency check";
-    //     return nullptr;
-    // }
 
     auto tasks = makeShared<SequentialTask>(this, QString("DependencyInfo: %1").arg(dep.addonId.toString()));
 
     auto responseInfo = new QByteArray();
-    auto info = provider->api->getProject(dep.addonId.toString(), responseInfo);
+    auto info = provider.api->getProject(dep.addonId.toString(), responseInfo);
     QObject::connect(info.get(), &NetJob::succeeded, [responseInfo, provider, pDep] {
         QJsonParseError parse_error{};
         QJsonDocument doc = QJsonDocument::fromJson(*responseInfo, &parse_error);
@@ -125,9 +123,9 @@ Task::Ptr GetModDependenciesTask::prepareDependencyTask(const ModPlatform::Depen
             return;
         }
         try {
-            auto obj = provider->name == ModPlatform::ResourceProvider::FLAME ? Json::requireObject(Json::requireObject(doc), "data")
+            auto obj = provider.name == ModPlatform::ResourceProvider::FLAME ? Json::requireObject(Json::requireObject(doc), "data")
                                                                              : Json::requireObject(doc);
-            provider->mod->loadIndexedPack(pDep->pack, obj);
+            provider.mod->loadIndexedPack(pDep->pack, obj);
         } catch (const JSONValidationError& e) {
             qDebug() << doc;
             qWarning() << "Error while reading mod info: " << e.cause();
@@ -146,7 +144,7 @@ Task::Ptr GetModDependenciesTask::prepareDependencyTask(const ModPlatform::Depen
             } else {
                 arr = doc.isObject() ? Json::ensureArray(doc.object(), "data") : doc.array();
             }
-            pDep->version = provider->mod->loadDependencyVersions(dep, arr);
+            pDep->version = provider.mod->loadDependencyVersions(dep, arr);
             if (!pDep->version.addonId.isValid()) {
                 qWarning() << "Error while reading mod version empty ";
                 qDebug() << doc;
@@ -164,12 +162,12 @@ Task::Ptr GetModDependenciesTask::prepareDependencyTask(const ModPlatform::Depen
             qWarning() << "Dependency cycle exeeded";
             return;
         }
-        for (auto dep : getDependenciesForVersion(pDep->version, provider->name)) {
+        for (auto dep : getDependenciesForVersion(pDep->version, provider.name)) {
-            addTask(prepareDependencyTask(dep, provider->name, level - 1));
+            addTask(prepareDependencyTask(dep, provider.name, level - 1));
         }
     };
 
-    auto version = provider->api->getDependencyVersion(std::move(args), std::move(callbacks));
+    auto version = provider.api->getDependencyVersion(std::move(args), std::move(callbacks));
     tasks->addTask(version);
     return tasks;
 };

launcher/minecraft/mod/tasks/GetModDependenciesTask.h

@@ -18,11 +18,10 @@
 
 #pragma once
 
-#include <qlist.h>
-#include <qvariant.h>
 #include <QDir>
 #include <QEventLoop>
 #include <QList>
+#include <QVariant>
 #include <functional>
 #include <memory>
 
@@ -74,7 +73,8 @@ class GetModDependenciesTask : public SequentialTask {
     QList<std::shared_ptr<PackDependecny>> m_pack_dependencies;
     QList<std::shared_ptr<Metadata::ModStruct>> m_mods;
     QList<std::shared_ptr<PackDependecny>> m_selected;
-    QList<Provider> m_providers;
+    Provider m_flame_provider;
+    Provider m_modrinth_provider;
 
     Version m_version;
     ResourceAPI::ModLoaderTypes m_loaderType;

launcher/modplatform/packwiz/Packwiz.cpp

@@ -21,8 +21,6 @@
 #include <QDebug>
 #include <QDir>
 #include <QObject>
-#include <algorithm>
-#include <iterator>
 
 #include "FileSystem.h"
 #include "StringUtils.h"
@@ -313,13 +311,4 @@ auto V1::getIndexForMod(QDir& index_dir, QVariant& mod_id) -> Mod
     return {};
 }
 
-auto V1::getAllMods(QDir& index_dir) -> QList<Mod>
-{
-    auto files = index_dir.entryList(QDir::Filter::Files);
-    auto mods = QList<Mod>();
-    std::transform(files.begin(), files.end(), std::back_inserter(mods),
-                   [&index_dir](auto file_name) { return getIndexForMod(index_dir, file_name); });
-    return mods;
-}
-
 }  // namespace Packwiz

launcher/modplatform/packwiz/Packwiz.h

@@ -93,9 +93,6 @@ class V1 {
      * If the mod doesn't have a metadata, it simply returns an empty Mod object.
      * */
     static auto getIndexForMod(QDir& index_dir, QVariant& mod_id) -> Mod;
-
-    /* Gets the metadata for all the mods */
-    static auto getAllMods(QDir& index_dir) -> QList<Mod>;
 };
 
 } // namespace Packwiz

launcher/ui/dialogs/ResourceDownloadDialog.cpp

@@ -26,7 +26,6 @@
 #include <memory>
 
 #include "Application.h"
-#include "QObjectPtr.h"
 #include "ResourceDownloadTask.h"
 
 #include "minecraft/mod/ModFolderModel.h"

launcher/ui/dialogs/ResourceDownloadDialog.h

@@ -27,7 +27,6 @@
 #include "QObjectPtr.h"
 #include "minecraft/mod/tasks/GetModDependenciesTask.h"
 #include "modplatform/ModIndex.h"
-#include "tasks/Task.h"
 #include "ui/pages/BasePageProvider.h"
 
 class BaseInstance;

launcher/ui/pages/modplatform/ModModel.cpp

@@ -49,20 +49,6 @@ ResourceAPI::VersionSearchArgs ModModel::createVersionsArguments(QModelIndex& en
     return { pack, versions, profile->getModLoaders() };
 }
 
-ResourceAPI::DependencySearchArgs ModModel::createDependecyArguments(const ModPlatform::Dependency& dep)
-{
-    auto profile = static_cast<MinecraftInstance const&>(m_base_instance).getPackProfile();
-
-    Q_ASSERT(profile);
-    Q_ASSERT(m_filter);
-
-    std::optional<std::list<Version>> versions{};
-    if (!m_filter->versions.empty())
-        versions = m_filter->versions;
-
-    return { dep, versions->front(), profile->getModLoaders().value() };
-};
-
 ResourceAPI::ProjectInfoArgs ModModel::createInfoArguments(QModelIndex& entry)
 {
     auto& pack = m_packs[entry.row()];

launcher/ui/pages/modplatform/ModModel.h

@@ -32,7 +32,7 @@ class ModModel : public ResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override = 0;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override = 0;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override = 0;
-    ModPlatform::IndexedVersion loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) override = 0;
+    virtual ModPlatform::IndexedVersion loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) = 0;
 
     void setFilter(std::shared_ptr<ModFilterWidget::Filter> filter) { m_filter = filter; }
 
@@ -40,7 +40,6 @@ class ModModel : public ResourceModel {
     ResourceAPI::SearchArgs createSearchArguments() override;
     ResourceAPI::VersionSearchArgs createVersionsArguments(QModelIndex&) override;
     ResourceAPI::ProjectInfoArgs createInfoArguments(QModelIndex&) override;
-    ResourceAPI::DependencySearchArgs createDependecyArguments(const ModPlatform::Dependency&) override;
 
    protected:
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override = 0;

launcher/ui/pages/modplatform/ResourceModel.cpp

@@ -324,11 +324,6 @@ void ResourceModel::loadIndexedPackVersions(ModPlatform::IndexedPack&, QJsonArra
 {
     NEED_FOR_CALLBACK_ASSERT("loadIndexedPackVersions");
 }
-ModPlatform::IndexedVersion ResourceModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr)
-{
-    NEED_FOR_CALLBACK_ASSERT("loadDependencyVersions");
-    return {};
-}
 
 /* Default callbacks */
 

launcher/ui/pages/modplatform/ResourceModel.h

@@ -70,9 +70,6 @@ class ResourceModel : public QAbstractListModel {
     virtual ResourceAPI::ProjectInfoArgs createInfoArguments(QModelIndex&) = 0;
     virtual ResourceAPI::ProjectInfoCallbacks createInfoCallbacks(QModelIndex&) { return {}; }
 
-    virtual ResourceAPI::DependencySearchArgs createDependecyArguments(const ModPlatform::Dependency&) { return {}; };
-    virtual ResourceAPI::DependencySearchCallbacks createDependecyCallbacks() { return {}; }
-
     /** Requests the API for more entries. */
     virtual void search();
 
@@ -109,7 +106,6 @@ class ResourceModel : public QAbstractListModel {
     virtual void loadIndexedPack(ModPlatform::IndexedPack&, QJsonObject&);
     virtual void loadExtraPackInfo(ModPlatform::IndexedPack&, QJsonObject&);
     virtual void loadIndexedPackVersions(ModPlatform::IndexedPack&, QJsonArray&);
-    virtual ModPlatform::IndexedVersion loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr);
 
    protected:
     /* Basic search parameters */

launcher/ui/pages/modplatform/ResourcePackModel.h

@@ -28,7 +28,6 @@ class ResourcePackResourceModel : public ResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack&, QJsonObject&) override = 0;
     void loadExtraPackInfo(ModPlatform::IndexedPack&, QJsonObject&) override = 0;
     void loadIndexedPackVersions(ModPlatform::IndexedPack&, QJsonArray&) override = 0;
-    ModPlatform::IndexedVersion loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) override = 0;
 
    public slots:
     ResourceAPI::SearchArgs createSearchArguments() override;

launcher/ui/pages/modplatform/ResourcePage.cpp

@@ -43,6 +43,9 @@
 #include <QKeyEvent>
 
 #include "Markdown.h"
+#include "ResourceDownloadTask.h"
+
+#include "minecraft/MinecraftInstance.h"
 
 #include "ui/dialogs/ResourceDownloadDialog.h"
 #include "ui/pages/modplatform/ResourceModel.h"

launcher/ui/pages/modplatform/ResourcePage.h

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include <QDir>
 #include <QTimer>
 #include <QWidget>
 
 #include "modplatform/ModIndex.h"
+#include "modplatform/ResourceAPI.h"
 
 #include "ui/pages/BasePage.h"
 #include "ui/widgets/ProgressWidget.h"

launcher/ui/pages/modplatform/ShaderPackModel.h

@@ -28,7 +28,6 @@ class ShaderPackResourceModel : public ResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack&, QJsonObject&) override = 0;
     void loadExtraPackInfo(ModPlatform::IndexedPack&, QJsonObject&) override = 0;
     void loadIndexedPackVersions(ModPlatform::IndexedPack&, QJsonArray&) override = 0;
-    ModPlatform::IndexedVersion loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) override = 0;
 
    public slots:
     ResourceAPI::SearchArgs createSearchArguments() override;

launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp

@@ -57,11 +57,6 @@ void FlameResourcePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m
     FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
-auto FlameResourcePackModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
-{
-    return FlameMod::loadDependencyVersions(m, arr);
-};
-
 auto FlameResourcePackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return Json::ensureArray(obj.object(), "data");
@@ -98,11 +93,6 @@ void FlameTexturePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m,
     m.versions = filtered_versions;
 }
 
-auto FlameTexturePackModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
-{
-    return FlameMod::loadDependencyVersions(m, arr);
-};
-
 ResourceAPI::SearchArgs FlameTexturePackModel::createSearchArguments()
 {
     auto args = TexturePackResourceModel::createSearchArguments();

launcher/ui/pages/modplatform/flame/FlameResourceModels.h

@@ -43,7 +43,6 @@ class FlameResourcePackModel : public ResourcePackResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
-    auto loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion override;
 
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
 };
@@ -62,7 +61,6 @@ class FlameTexturePackModel : public TexturePackResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
-    auto loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion override;
 
     ResourceAPI::SearchArgs createSearchArguments() override;
     ResourceAPI::VersionSearchArgs createVersionsArguments(QModelIndex&) override;

launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp

@@ -69,11 +69,6 @@ void ModrinthResourcePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack
     ::Modrinth::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
-auto ModrinthResourcePackModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
-{
-    return ::Modrinth::loadDependencyVersions(m, arr);
-};
-
 auto ModrinthResourcePackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return obj.object().value("hits").toArray();
@@ -96,11 +91,6 @@ void ModrinthTexturePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack&
     ::Modrinth::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
-auto ModrinthTexturePackModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
-{
-    return ::Modrinth::loadDependencyVersions(m, arr);
-};
-
 auto ModrinthTexturePackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return obj.object().value("hits").toArray();
@@ -123,11 +113,6 @@ void ModrinthShaderPackModel::loadIndexedPackVersions(ModPlatform::IndexedPack&
     ::Modrinth::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
-auto ModrinthShaderPackModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
-{
-    return ::Modrinth::loadDependencyVersions(m, arr);
-};
-
 auto ModrinthShaderPackModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return obj.object().value("hits").toArray();

launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.h

@@ -59,7 +59,6 @@ class ModrinthResourcePackModel : public ResourcePackResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
-    auto loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion override;
 
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
 };
@@ -78,7 +77,6 @@ class ModrinthTexturePackModel : public TexturePackResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
-    auto loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion override;
 
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
 };
@@ -97,7 +95,6 @@ class ModrinthShaderPackModel : public ShaderPackResourceModel {
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
-    auto loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion override;
 
     auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
 };