move ExtractZipTask

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

launcher/InstanceImportTask.cpp

@@ -38,10 +38,11 @@
 
 #include "Application.h"
 #include "FileSystem.h"
-#include "MMCZip.h"
 #include "NullInstance.h"
 
 #include "QObjectPtr.h"
+#include "archive/ArchiveReader.h"
+#include "archive/ExtractZipTask.h"
 #include "icons/IconList.h"
 #include "icons/IconUtils.h"
 
@@ -54,8 +55,8 @@
 
 #include "net/ApiDownload.h"
 
+#include <QFileInfo>
 #include <QtConcurrentRun>
-#include <algorithm>
 #include <memory>
 
 #include <quazip/quazipdir.h>
@@ -109,38 +110,26 @@ void InstanceImportTask::downloadFromUrl()
     filesNetJob->start();
 }
 
-QString InstanceImportTask::getRootFromZip(QuaZip* zip, const QString& root)
+QString InstanceImportTask::getRootFromZip(QStringList files)
 {
     if (!isRunning()) {
         return {};
     }
-    QuaZipDir rootDir(zip, root);
-    for (auto&& fileName : rootDir.entryList(QDir::Files)) {
+    for (auto&& fileName : files) {
         setDetails(fileName);
-        if (fileName == "instance.cfg") {
+        QFileInfo fileInfo(fileName);
+        if (fileInfo.fileName() == "instance.cfg") {
             qDebug() << "MultiMC:" << true;
             m_modpackType = ModpackType::MultiMC;
-            return root;
+            return fileInfo.path();
         }
-        if (fileName == "manifest.json") {
+        if (fileInfo.fileName() == "manifest.json") {
             qDebug() << "Flame:" << true;
             m_modpackType = ModpackType::Flame;
-            return root;
+            return fileInfo.path();
         }
-
         QCoreApplication::processEvents();
     }
-
-    // Recurse the search to non-ignored subfolders
-    for (auto&& fileName : rootDir.entryList(QDir::Dirs)) {
-        if ("overrides/" == fileName)
-            continue;
-
-        QString result = getRootFromZip(zip, root + fileName);
-        if (!result.isEmpty())
-            return result;
-    }
-
     return {};
 }
 
@@ -151,13 +140,12 @@ void InstanceImportTask::processZipPack()
     qDebug() << "Attempting to create instance from" << m_archivePath;
 
     // open the zip and find relevant files in it
-    auto packZip = std::make_shared<QuaZip>(m_archivePath);
-    if (!packZip->open(QuaZip::mdUnzip)) {
+    MMCZip::ArchiveReader packZip(m_archivePath);
+    if (!packZip.collectFiles()) {
         emitFailed(tr("Unable to open supplied modpack zip file."));
         return;
     }
 
-    QuaZipDir packZipDir(packZip.get());
     qDebug() << "Attempting to determine instance type";
 
     QString root;
@@ -165,18 +153,18 @@ void InstanceImportTask::processZipPack()
     // NOTE: Prioritize modpack platforms that aren't searched for recursively.
     // Especially Flame has a very common filename for its manifest, which may appear inside overrides for example
     // https://docs.modrinth.com/docs/modpacks/format_definition/#storage
-    if (packZipDir.exists("/modrinth.index.json")) {
+    if (packZip.exists("/modrinth.index.json")) {
         // process as Modrinth pack
         qDebug() << "Modrinth:" << true;
         m_modpackType = ModpackType::Modrinth;
-    } else if (packZipDir.exists("/bin/modpack.jar") || packZipDir.exists("/bin/version.json")) {
+    } else if (packZip.exists("/bin/modpack.jar") || packZip.exists("/bin/version.json")) {
         // process as Technic pack
         qDebug() << "Technic:" << true;
         extractDir.mkpath("minecraft");
         extractDir.cd("minecraft");
         m_modpackType = ModpackType::Technic;
     } else {
-        root = getRootFromZip(packZip.get());
+        root = getRootFromZip(packZip.getFiles());
         setDetails("");
     }
     if (m_modpackType == ModpackType::Unknown) {
@@ -186,7 +174,7 @@ void InstanceImportTask::processZipPack()
     setStatus(tr("Extracting modpack"));
 
     // make sure we extract just the pack
-    auto zipTask = makeShared<MMCZip::ExtractZipTask>(packZip, extractDir, root);
+    auto zipTask = makeShared<MMCZip::ExtractZipTask>(m_archivePath, extractDir, root);
 
     auto progressStep = std::make_shared<TaskStepProgress>();
     connect(zipTask.get(), &Task::finished, this, [this, progressStep] {