2 files changed, 46 insertions, 24 deletions

diff --git a/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp b/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
index dcff1028..9cc227f2 100644
--- a/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
+++ b/launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
@@ -30,11 +30,12 @@
 #include <windows.h>
 #endif
 
-GetModDependenciesTask::GetModDependenciesTask(QDir index_dir, QList<ModPlatform::IndexedVersion> selected, NewDependecyVersionAPITask& api)
+GetModDependenciesTask::GetModDependenciesTask(QDir index_dir, QList<ModPlatform::IndexedVersion> selected, NewDependecyVersionAPITask api)
     : m_selected(selected), m_getDependenciesVersionAPI(api)
 {
     m_getAllMods = makeShared<LocalModGetAllTask>(index_dir);
     m_getNetworkDep = makeShared<SequentialTask>(this, "GetDepInfo");
+    connect(m_getNetworkDep.get(), &Task::finished, &loop, &QEventLoop::quit);
     QObject::connect(m_getAllMods.get(), &LocalModGetAllTask::getAllMod, [this](QList<Metadata::ModStruct> mods) {
         m_mods = mods;
         prepareDependecies();
@@ -49,6 +50,8 @@ void GetModDependenciesTask::executeTask()
 {
     setStatus(tr("Geting all mods"));
     m_getAllMods->start();
+    loop.exec();
+    emitSucceeded();
 }
 
 auto GetModDependenciesTask::abort() -> bool
@@ -61,22 +64,21 @@ void GetModDependenciesTask::prepareDependecies()
 {
     auto c_dependencies = getDependenciesForVersions(m_selected);
     if (c_dependencies.length() == 0) {
-        emitSucceeded();
+        m_getNetworkDep->start();
         return;
     }
     for (auto dep : c_dependencies) {
-        auto task = m_getDependenciesVersionAPI(
-            dep, 20, [this](QList<ModPlatform::IndexedVersion> new_versions, int level) { addDependecies(new_versions, level - 1); });
+        auto task = m_getDependenciesVersionAPI(dep, [this](ModPlatform::IndexedVersion new_version) { addDependecies(new_version, 20); });
         m_getNetworkDep->addTask(task);
     }
     m_getNetworkDep->start();
 }
 
-void GetModDependenciesTask::addDependecies(QList<ModPlatform::IndexedVersion> new_versions, int level)
+void GetModDependenciesTask::addDependecies(ModPlatform::IndexedVersion new_version, int level)
 {
     // some mutex?
-    m_dependencies.append(new_versions);
-    auto c_dependencies = getDependenciesForVersions(m_selected);
+    m_dependencies.append(new_version);
+    auto c_dependencies = getDependenciesForVersion(new_version);
     if (c_dependencies.length() == 0) {
         return;
     }
@@ -85,7 +87,7 @@ void GetModDependenciesTask::addDependecies(QList<ModPlatform::IndexedVersion> n
     }
     for (auto dep : c_dependencies) {
         auto task = m_getDependenciesVersionAPI(
-            dep, 20, [this](QList<ModPlatform::IndexedVersion> new_versions, int level) { addDependecies(new_versions, level - 1); });
+            dep, [this, level](ModPlatform::IndexedVersion new_versions) { addDependecies(new_versions, level - 1); });
         m_getNetworkDep->addTask(task);
     }
 };
@@ -99,18 +101,36 @@ QList<ModPlatform::Dependency> GetModDependenciesTask::getDependenciesForVersion
                 if (auto dep = std::find_if(c_dependencies.begin(), c_dependencies.end(),
                                             [ver_dep](auto i) { return i.addonId == ver_dep.addonId; });
                     dep == c_dependencies.end()) {  // check the current dependency list
-                    c_dependencies.append(ver_dep);
-                } else if (auto dep =
-                               std::find_if(selected.begin(), selected.end(), [ver_dep](auto i) { return i.addonId == ver_dep.addonId; });
-                           dep == selected.end()) {  // check the selected versions
-                    c_dependencies.append(ver_dep);
-                } else if (auto dep =
-                               std::find_if(m_mods.begin(), m_mods.end(), [ver_dep](auto i) { return i.mod_id() == ver_dep.addonId; });
-                           dep == m_mods.end()) {  // check the existing mods
-                    c_dependencies.append(ver_dep);
+                    if (auto dep =
+                            std::find_if(selected.begin(), selected.end(), [ver_dep](auto i) { return i.addonId == ver_dep.addonId; });
+                        dep == selected.end()) {  // check the selected versions
+                        if (auto dep =
+                                std::find_if(m_mods.begin(), m_mods.end(), [ver_dep](auto i) { return i.mod_id() == ver_dep.addonId; });
+                            dep == m_mods.end()) {  // check the existing mods
+                            c_dependencies.append(ver_dep);
+                        }
+                    }
                 }
             }
         }
     }
     return c_dependencies;
 };
+
+QList<ModPlatform::Dependency> GetModDependenciesTask::getDependenciesForVersion(ModPlatform::IndexedVersion version)
+{
+    auto c_dependencies = QList<ModPlatform::Dependency>();
+    for (auto ver_dep : version.dependencies) {
+        if (ver_dep.type == ModPlatform::DependencyType::REQUIRED) {
+            if (auto dep =
+                    std::find_if(c_dependencies.begin(), c_dependencies.end(), [ver_dep](auto i) { return i.addonId == ver_dep.addonId; });
+                dep == c_dependencies.end()) {  // check the current dependency list
+                if (auto dep = std::find_if(m_mods.begin(), m_mods.end(), [ver_dep](auto i) { return i.mod_id() == ver_dep.addonId; });
+                    dep == m_mods.end()) {  // check the existing mods
+                    c_dependencies.append(ver_dep);
+                }
+            }
+        }
+    }
+    return c_dependencies;
+};
\ No newline at end of file
diff --git a/launcher/minecraft/mod/tasks/GetModDependenciesTask.h b/launcher/minecraft/mod/tasks/GetModDependenciesTask.h
index 28112bba..4353c1e1 100644
--- a/launcher/minecraft/mod/tasks/GetModDependenciesTask.h
+++ b/launcher/minecraft/mod/tasks/GetModDependenciesTask.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include <qcoreevent.h>
+#include <qeventloop.h>
 #include <QDir>
 #include <functional>
 
@@ -33,24 +35,23 @@ class GetModDependenciesTask : public Task {
     using Ptr = shared_qobject_ptr<GetModDependenciesTask>;
     using LocalModGetAllTaskPtr = shared_qobject_ptr<LocalModGetAllTask>;
 
-    using NewDependecyVersionAPITask =
-        std::function<Task::Ptr(ModPlatform::Dependency, int, std::function<void(QList<ModPlatform::IndexedVersion>, int)>)>;
+    using NewDependecyVersionAPITask = std::function<Task::Ptr(ModPlatform::Dependency, std::function<void(ModPlatform::IndexedVersion)>)>;
 
-    explicit GetModDependenciesTask(QDir index_dir, QList<ModPlatform::IndexedVersion> selected, NewDependecyVersionAPITask& api);
+    explicit GetModDependenciesTask(QDir index_dir, QList<ModPlatform::IndexedVersion> selected, NewDependecyVersionAPITask api);
 
     auto canAbort() const -> bool override { return true; }
     auto abort() -> bool override;
 
+    auto getDependecies() const -> QList<ModPlatform::IndexedVersion> { return m_dependencies; }
+
    protected slots:
     //! Entry point for tasks.
     void executeTask() override;
 
     void prepareDependecies();
-    void addDependecies(QList<ModPlatform::IndexedVersion>, int);
+    void addDependecies(ModPlatform::IndexedVersion, int);
     QList<ModPlatform::Dependency> getDependenciesForVersions(QList<ModPlatform::IndexedVersion>);
-
-   signals:
-    void getAllMod(QList<Metadata::ModStruct>);
+    QList<ModPlatform::Dependency> getDependenciesForVersion(ModPlatform::IndexedVersion);
 
    private:
     QList<ModPlatform::IndexedVersion> m_selected;
@@ -60,4 +61,5 @@ class GetModDependenciesTask : public Task {
     LocalModGetAllTaskPtr m_getAllMods = nullptr;
     NewDependecyVersionAPITask m_getDependenciesVersionAPI;
     SequentialTask::Ptr m_getNetworkDep;
+    QEventLoop loop;
 };