NOISSUE asynchronous, parallel mod folder listing and mod resolving

MultiMC · Aug 4, 2019 · a3ffa3d · a3ffa3d
1 parent 7d13e31
commit a3ffa3d
Show file tree

Hide file tree

Showing 21 changed files with 821 additions and 543 deletions.
diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt
@@ -279,15 +279,21 @@ set(MINECRAFT_SOURCES
     minecraft/VersionFile.h
     minecraft/VersionFilterData.h
     minecraft/VersionFilterData.cpp
-    minecraft/Mod.h
-    minecraft/Mod.cpp
-    minecraft/SimpleModList.h
-    minecraft/SimpleModList.cpp
     minecraft/World.h
     minecraft/World.cpp
     minecraft/WorldList.h
     minecraft/WorldList.cpp
 
+    minecraft/mod/Mod.h
+    minecraft/mod/Mod.cpp
+    minecraft/mod/ModDetails.h
+    minecraft/mod/ModFolderModel.h
+    minecraft/mod/ModFolderModel.cpp
+    minecraft/mod/ModFolderLoadTask.h
+    minecraft/mod/ModFolderLoadTask.cpp
+    minecraft/mod/LocalModParseTask.h
+    minecraft/mod/LocalModParseTask.cpp
+
     # Assets
     minecraft/AssetsUtils.h
     minecraft/AssetsUtils.cpp
@@ -318,8 +324,8 @@ add_unit_test(Library
     )
 
 # FIXME: shares data with FileSystem test
-add_unit_test(SimpleModList
-    SOURCES minecraft/SimpleModList_test.cpp
+add_unit_test(ModFolderModel
+    SOURCES minecraft/mod/ModFolderModel_test.cpp
     DATA testdata
     LIBS MultiMC_logic
     )
@@ -479,8 +485,6 @@ set(LOGIC_SOURCES
     ${FLAME_SOURCES}
 )
 
-message(STATUS "FOO! ${LOGIC_SOURCES}")
-
 add_library(MultiMC_logic SHARED ${LOGIC_SOURCES})
 set_target_properties(MultiMC_logic PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
 

diff --git a/api/logic/MMCZip.h b/api/logic/MMCZip.h
@@ -18,7 +18,7 @@
 #include <QString>
 #include <QFileInfo>
 #include <QSet>
-#include "minecraft/Mod.h"
+#include "minecraft/mod/Mod.h"
 #include <functional>
 
 #include "multimc_logic_export.h"

diff --git a/api/logic/minecraft/MinecraftInstance.cpp b/api/logic/minecraft/MinecraftInstance.cpp
@@ -26,7 +26,7 @@
 #include "meta/Index.h"
 #include "meta/VersionList.h"
 
-#include "SimpleModList.h"
+#include "mod/ModFolderModel.h"
 #include "WorldList.h"
 
 #include "icons/IIconList.h"
@@ -892,46 +892,46 @@ JavaVersion MinecraftInstance::getJavaVersion() const
     return JavaVersion(settings()->get("JavaVersion").toString());
 }
 
-std::shared_ptr<SimpleModList> MinecraftInstance::loaderModList() const
+std::shared_ptr<ModFolderModel> MinecraftInstance::loaderModList() const
 {
     if (!m_loader_mod_list)
     {
-        m_loader_mod_list.reset(new SimpleModList(loaderModsDir()));
+        m_loader_mod_list.reset(new ModFolderModel(loaderModsDir()));
         m_loader_mod_list->disableInteraction(isRunning());
-        connect(this, &BaseInstance::runningStatusChanged, m_loader_mod_list.get(), &SimpleModList::disableInteraction);
+        connect(this, &BaseInstance::runningStatusChanged, m_loader_mod_list.get(), &ModFolderModel::disableInteraction);
     }
     return m_loader_mod_list;
 }
 
-std::shared_ptr<SimpleModList> MinecraftInstance::coreModList() const
+std::shared_ptr<ModFolderModel> MinecraftInstance::coreModList() const
 {
     if (!m_core_mod_list)
     {
-        m_core_mod_list.reset(new SimpleModList(coreModsDir()));
+        m_core_mod_list.reset(new ModFolderModel(coreModsDir()));
         m_core_mod_list->disableInteraction(isRunning());
-        connect(this, &BaseInstance::runningStatusChanged, m_core_mod_list.get(), &SimpleModList::disableInteraction);
+        connect(this, &BaseInstance::runningStatusChanged, m_core_mod_list.get(), &ModFolderModel::disableInteraction);
     }
     return m_core_mod_list;
 }
 
-std::shared_ptr<SimpleModList> MinecraftInstance::resourcePackList() const
+std::shared_ptr<ModFolderModel> MinecraftInstance::resourcePackList() const
 {
     if (!m_resource_pack_list)
     {
-        m_resource_pack_list.reset(new SimpleModList(resourcePacksDir()));
+        m_resource_pack_list.reset(new ModFolderModel(resourcePacksDir()));
         m_resource_pack_list->disableInteraction(isRunning());
-        connect(this, &BaseInstance::runningStatusChanged, m_resource_pack_list.get(), &SimpleModList::disableInteraction);
+        connect(this, &BaseInstance::runningStatusChanged, m_resource_pack_list.get(), &ModFolderModel::disableInteraction);
     }
     return m_resource_pack_list;
 }
 
-std::shared_ptr<SimpleModList> MinecraftInstance::texturePackList() const
+std::shared_ptr<ModFolderModel> MinecraftInstance::texturePackList() const
 {
     if (!m_texture_pack_list)
     {
-        m_texture_pack_list.reset(new SimpleModList(texturePacksDir()));
+        m_texture_pack_list.reset(new ModFolderModel(texturePacksDir()));
         m_texture_pack_list->disableInteraction(isRunning());
-        connect(this, &BaseInstance::runningStatusChanged, m_texture_pack_list.get(), &SimpleModList::disableInteraction);
+        connect(this, &BaseInstance::runningStatusChanged, m_texture_pack_list.get(), &ModFolderModel::disableInteraction);
     }
     return m_texture_pack_list;
 }

diff --git a/api/logic/minecraft/MinecraftInstance.h b/api/logic/minecraft/MinecraftInstance.h
@@ -1,13 +1,13 @@
 #pragma once
 #include "BaseInstance.h"
 #include <java/JavaVersion.h>
-#include "minecraft/Mod.h"
+#include "minecraft/mod/Mod.h"
 #include <QProcess>
 #include <QDir>
 #include "multimc_logic_export.h"
 
 class ModsModel;
-class SimpleModList;
+class ModFolderModel;
 class WorldList;
 class GameOptions;
 class LaunchStep;
@@ -69,10 +69,10 @@ class MULTIMC_LOGIC_EXPORT MinecraftInstance: public BaseInstance
 
     //////  Mod Lists  //////
     std::shared_ptr<ModsModel> modsModel() const;
-    std::shared_ptr<SimpleModList> loaderModList() const;
-    std::shared_ptr<SimpleModList> coreModList() const;
-    std::shared_ptr<SimpleModList> resourcePackList() const;
-    std::shared_ptr<SimpleModList> texturePackList() const;
+    std::shared_ptr<ModFolderModel> loaderModList() const;
+    std::shared_ptr<ModFolderModel> coreModList() const;
+    std::shared_ptr<ModFolderModel> resourcePackList() const;
+    std::shared_ptr<ModFolderModel> texturePackList() const;
     std::shared_ptr<WorldList> worldList() const;
     std::shared_ptr<GameOptions> gameOptionsModel() const;
 
@@ -124,10 +124,10 @@ class MULTIMC_LOGIC_EXPORT MinecraftInstance: public BaseInstance
 protected: // data
     std::shared_ptr<ComponentList> m_components;
     mutable std::shared_ptr<ModsModel> m_mods_model;
-    mutable std::shared_ptr<SimpleModList> m_loader_mod_list;
-    mutable std::shared_ptr<SimpleModList> m_core_mod_list;
-    mutable std::shared_ptr<SimpleModList> m_resource_pack_list;
-    mutable std::shared_ptr<SimpleModList> m_texture_pack_list;
+    mutable std::shared_ptr<ModFolderModel> m_loader_mod_list;
+    mutable std::shared_ptr<ModFolderModel> m_core_mod_list;
+    mutable std::shared_ptr<ModFolderModel> m_resource_pack_list;
+    mutable std::shared_ptr<ModFolderModel> m_texture_pack_list;
     mutable std::shared_ptr<WorldList> m_world_list;
     mutable std::shared_ptr<GameOptions> m_game_options;
 };