fix(Inst.Import): don't search inside 'overrides/' for the manifest

It will never be there anyways, and saves a **bunch** of time when the
overrides folder is big and we traverse all the tree when searching for
the MMC 'instance.cfg' file.

Signed-off-by: flow <flowlnlnln@gmail.com>

1 files changed, 16 insertions, 11 deletions

diff --git a/launcher/MMCZip.cpp b/launcher/MMCZip.cpp
index 9f4e968f..f6600343 100644
--- a/launcher/MMCZip.cpp
+++ b/launcher/MMCZip.cpp
@@ -39,6 +39,7 @@
 #include "MMCZip.h"
 #include "FileSystem.h"
 
+#include <QCoreApplication>
 #include <QDebug>
 
 // ours
@@ -228,23 +229,27 @@ bool MMCZip::createModdedJar(QString sourceJarPath, QString targetJarPath, const
 }
 
 // ours
-QString MMCZip::findFolderOfFileInZip(QuaZip * zip, const QString & what, const QString &root)
+QString MMCZip::findFolderOfFileInZip(QuaZip* zip, const QString& what, const QStringList& ignore_paths, const QString& root)
 {
     QuaZipDir rootDir(zip, root);
-    for(auto fileName: rootDir.entryList(QDir::Files))
-    {
-        if(fileName == what)
+    for (auto&& fileName : rootDir.entryList(QDir::Files)) {
+        if (fileName == what)
             return root;
+
+        QCoreApplication::processEvents();
     }
-    for(auto fileName: rootDir.entryList(QDir::Dirs))
-    {
-        QString result = findFolderOfFileInZip(zip, what, root + fileName);
-        if(!result.isEmpty())
-        {
+
+    // Recurse the search to non-ignored subfolders
+    for (auto&& fileName : rootDir.entryList(QDir::Dirs)) {
+        if (ignore_paths.contains(fileName))
+            continue;
+
+        QString result = findFolderOfFileInZip(zip, what, ignore_paths, root + fileName);
+        if (!result.isEmpty())
             return result;
-        }
     }
-    return QString();
+
+    return {};
 }
 
 // ours