Merge branch 'develop' into remove-updater

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

1 files changed, 46 insertions, 28 deletions

diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index b97870da..6b3fd296 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -257,20 +257,26 @@ void InstanceImportTask::extractAborted()
 
 void InstanceImportTask::processFlame()
 {
-    auto pack_id_it = m_extra_info.constFind("pack_id");
-    Q_ASSERT(pack_id_it != m_extra_info.constEnd());
-    auto pack_id = pack_id_it.value();
-
-    auto pack_version_id_it = m_extra_info.constFind("pack_version_id");
-    Q_ASSERT(pack_version_id_it != m_extra_info.constEnd());
-    auto pack_version_id = pack_version_id_it.value();
-
-    QString original_instance_id;
-    auto original_instance_id_it = m_extra_info.constFind("original_instance_id");
-    if (original_instance_id_it != m_extra_info.constEnd())
-        original_instance_id = original_instance_id_it.value();
-
-    auto* inst_creation_task = new FlameCreationTask(m_stagingPath, m_globalSettings, m_parent, pack_id, pack_version_id, original_instance_id);
+    FlameCreationTask* inst_creation_task = nullptr;
+    if (!m_extra_info.isEmpty()) {
+        auto pack_id_it = m_extra_info.constFind("pack_id");
+        Q_ASSERT(pack_id_it != m_extra_info.constEnd());
+        auto pack_id = pack_id_it.value();
+
+        auto pack_version_id_it = m_extra_info.constFind("pack_version_id");
+        Q_ASSERT(pack_version_id_it != m_extra_info.constEnd());
+        auto pack_version_id = pack_version_id_it.value();
+
+        QString original_instance_id;
+        auto original_instance_id_it = m_extra_info.constFind("original_instance_id");
+        if (original_instance_id_it != m_extra_info.constEnd())
+            original_instance_id = original_instance_id_it.value();
+
+        inst_creation_task = new FlameCreationTask(m_stagingPath, m_globalSettings, m_parent, pack_id, pack_version_id, original_instance_id);
+    } else {
+        // FIXME: Find a way to get IDs in directly imported ZIPs
+        inst_creation_task = new FlameCreationTask(m_stagingPath, m_globalSettings, m_parent, {}, {});
+    }
 
     inst_creation_task->setName(*this);
     inst_creation_task->setIcon(m_instIcon);
@@ -335,21 +341,33 @@ void InstanceImportTask::processMultiMC()
 
 void InstanceImportTask::processModrinth()
 {
-    auto pack_id_it = m_extra_info.constFind("pack_id");
-    Q_ASSERT(pack_id_it != m_extra_info.constEnd());
-    auto pack_id = pack_id_it.value();
-
-    QString pack_version_id;
-    auto pack_version_id_it = m_extra_info.constFind("pack_version_id");
-    if (pack_version_id_it != m_extra_info.constEnd())
-        pack_version_id = pack_version_id_it.value();
-
-    QString original_instance_id;
-    auto original_instance_id_it = m_extra_info.constFind("original_instance_id");
-    if (original_instance_id_it != m_extra_info.constEnd())
-        original_instance_id = original_instance_id_it.value();
+    ModrinthCreationTask* inst_creation_task = nullptr;
+    if (!m_extra_info.isEmpty()) {
+        auto pack_id_it = m_extra_info.constFind("pack_id");
+        Q_ASSERT(pack_id_it != m_extra_info.constEnd());
+        auto pack_id = pack_id_it.value();
+
+        QString pack_version_id;
+        auto pack_version_id_it = m_extra_info.constFind("pack_version_id");
+        if (pack_version_id_it != m_extra_info.constEnd())
+            pack_version_id = pack_version_id_it.value();
+
+        QString original_instance_id;
+        auto original_instance_id_it = m_extra_info.constFind("original_instance_id");
+        if (original_instance_id_it != m_extra_info.constEnd())
+            original_instance_id = original_instance_id_it.value();
+
+        inst_creation_task = new ModrinthCreationTask(m_stagingPath, m_globalSettings, m_parent, pack_id, pack_version_id, original_instance_id);
+    } else {
+        QString pack_id;
+        if (!m_sourceUrl.isEmpty()) {
+            QRegularExpression regex(R"(data\/(.*)\/versions)");
+            pack_id = regex.match(m_sourceUrl.toString()).captured(1);
+        }
 
-    auto* inst_creation_task = new ModrinthCreationTask(m_stagingPath, m_globalSettings, m_parent, pack_id, pack_version_id, original_instance_id);
+        // FIXME: Find a way to get the ID in directly imported ZIPs
+        inst_creation_task = new ModrinthCreationTask(m_stagingPath, m_globalSettings, m_parent, pack_id);
+    }
 
     inst_creation_task->setName(*this);
     inst_creation_task->setIcon(m_instIcon);