Merge remote-tracking branch 'upstream/develop' into resource-meta

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

launcher/minecraft/mod/tasks/BasicFolderLoadTask.h

@@ -0,0 +1,85 @@
+#pragma once
+
+#include <QDir>
+#include <QMap>
+#include <QObject>
+#include <QThread>
+
+#include <memory>
+
+#include "Application.h"
+#include "FileSystem.h"
+#include "minecraft/mod/Resource.h"
+
+#include "tasks/Task.h"
+
+/** Very simple task that just loads a folder's contents directly.
+ */
+class BasicFolderLoadTask : public Task {
+    Q_OBJECT
+   public:
+    struct Result {
+        QMap<QString, Resource::Ptr> resources;
+    };
+    using ResultPtr = std::shared_ptr<Result>;
+
+    [[nodiscard]] ResultPtr result() const { return m_result; }
+
+   public:
+    BasicFolderLoadTask(QDir dir) : Task(nullptr, false), m_dir(dir), m_result(new Result), m_thread_to_spawn_into(thread())
+    {
+        m_create_func = [](QFileInfo const& entry) -> Resource::Ptr { return makeShared<Resource>(entry); };
+    }
+    BasicFolderLoadTask(QDir dir, std::function<Resource::Ptr(QFileInfo const&)> create_function)
+        : Task(nullptr, false)
+        , m_dir(dir)
+        , m_result(new Result)
+        , m_create_func(std::move(create_function))
+        , m_thread_to_spawn_into(thread())
+    {}
+
+    [[nodiscard]] bool canAbort() const override { return true; }
+    bool abort() override
+    {
+        m_aborted.store(true);
+        return true;
+    }
+
+    void executeTask() override
+    {
+        if (thread() != m_thread_to_spawn_into)
+            connect(this, &Task::finished, this->thread(), &QThread::quit);
+
+        m_dir.refresh();
+        for (auto entry : m_dir.entryInfoList()) {
+            auto filePath = entry.absoluteFilePath();
+            if (auto app = APPLICATION_DYN; app && app->checkQSavePath(filePath)) {
+                continue;
+            }
+            auto newFilePath = FS::getUniqueResourceName(filePath);
+            if (newFilePath != filePath) {
+                FS::move(filePath, newFilePath);
+                entry = QFileInfo(newFilePath);
+            }
+            auto resource = m_create_func(entry);
+            resource->moveToThread(m_thread_to_spawn_into);
+            m_result->resources.insert(resource->internal_id(), resource);
+        }
+
+        if (m_aborted)
+            emit finished();
+        else
+            emitSucceeded();
+    }
+
+   private:
+    QDir m_dir;
+    ResultPtr m_result;
+
+    std::atomic<bool> m_aborted = false;
+
+    std::function<Resource::Ptr(QFileInfo const&)> m_create_func;
+
+    /** This is the thread in which we should put new mod objects */
+    QThread* m_thread_to_spawn_into;
+};

launcher/minecraft/mod/tasks/LocalModParseTask.cpp

@@ -647,11 +647,11 @@ bool validate(QFileInfo file)
     return ModUtils::process(mod, ProcessingLevel::BasicInfoOnly) && mod.valid();
 }
 
-bool processIconPNG(const Mod& mod, QByteArray&& raw_data)
+bool processIconPNG(const Mod& mod, QByteArray&& raw_data, QPixmap* pixmap)
 {
     auto img = QImage::fromData(raw_data);
     if (!img.isNull()) {
-        mod.setIcon(img);
+        *pixmap = mod.setIcon(img);
     } else {
         qWarning() << "Failed to parse mod logo:" << mod.iconPath() << "from" << mod.name();
         return false;
@@ -659,15 +659,15 @@ bool processIconPNG(const Mod& mod, QByteArray&& raw_data)
     return true;
 }
 
-bool loadIconFile(const Mod& mod)
+bool loadIconFile(const Mod& mod, QPixmap* pixmap)
 {
     if (mod.iconPath().isEmpty()) {
         qWarning() << "No Iconfile set, be sure to parse the mod first";
         return false;
     }
 
-    auto png_invalid = [&mod]() {
-        qWarning() << "Mod at" << mod.fileinfo().filePath() << "does not have a valid icon";
+    auto png_invalid = [&mod](const QString& reason) {
+        qWarning() << "Mod at" << mod.fileinfo().filePath() << "does not have a valid icon:" << reason;
         return false;
     };
 
@@ -676,24 +676,26 @@ bool loadIconFile(const Mod& mod)
             QFileInfo icon_info(FS::PathCombine(mod.fileinfo().filePath(), mod.iconPath()));
             if (icon_info.exists() && icon_info.isFile()) {
                 QFile icon(icon_info.filePath());
-                if (!icon.open(QIODevice::ReadOnly))
-                    return false;
+                if (!icon.open(QIODevice::ReadOnly)) {
+                    return png_invalid("failed  to open file " + icon_info.filePath());
+                }
                 auto data = icon.readAll();
 
-                bool icon_result = ModUtils::processIconPNG(mod, std::move(data));
+                bool icon_result = ModUtils::processIconPNG(mod, std::move(data), pixmap);
 
                 icon.close();
 
                 if (!icon_result) {
-                    return png_invalid();  // icon invalid
+                    return png_invalid("invalid png image");  // icon invalid
                 }
+                return true;
             }
-            return false;
+            return png_invalid("file '" + icon_info.filePath() + "' does not exists or is not a file");
         }
         case ResourceType::ZIPFILE: {
             QuaZip zip(mod.fileinfo().filePath());
             if (!zip.open(QuaZip::mdUnzip))
-                return false;
+                return png_invalid("failed to open '" + mod.fileinfo().filePath() + "' as a zip archive");
 
             QuaZipFile file(&zip);
 
@@ -701,28 +703,27 @@ bool loadIconFile(const Mod& mod)
                 if (!file.open(QIODevice::ReadOnly)) {
                     qCritical() << "Failed to open file in zip.";
                     zip.close();
-                    return png_invalid();
+                    return png_invalid("Failed to open '" + mod.iconPath() + "' in zip archive");
                 }
 
                 auto data = file.readAll();
 
-                bool icon_result = ModUtils::processIconPNG(mod, std::move(data));
+                bool icon_result = ModUtils::processIconPNG(mod, std::move(data), pixmap);
 
                 file.close();
                 if (!icon_result) {
-                    return png_invalid();  // icon png invalid
+                    return png_invalid("invalid png image");  // icon png invalid
                 }
-            } else {
-                return png_invalid();  // could not set icon as current file.
+                return true;
             }
-            return false;
+            return png_invalid("Failed to set '" + mod.iconPath() +
+                               "' as current file in zip archive");  // could not set icon as current file.
         }
         case ResourceType::LITEMOD: {
-            return false;  // can lightmods even have icons?
+            return png_invalid("litemods do not have icons");  // can lightmods even have icons?
         }
         default:
-            qWarning() << "Invalid type for mod, can not load icon.";
-            return false;
+            return png_invalid("Invalid type for mod, can not load icon.");
     }
 }
 

launcher/minecraft/mod/tasks/LocalModParseTask.h

@@ -26,8 +26,8 @@ bool processLitemod(Mod& mod, ProcessingLevel level = ProcessingLevel::Full);
 /** Checks whether a file is valid as a mod or not. */
 bool validate(QFileInfo file);
 
-bool processIconPNG(const Mod& mod, QByteArray&& raw_data);
-bool loadIconFile(const Mod& mod);
+bool processIconPNG(const Mod& mod, QByteArray&& raw_data, QPixmap* pixmap);
+bool loadIconFile(const Mod& mod, QPixmap* pixmap);
 }  // namespace ModUtils
 
 class LocalModParseTask : public Task {

launcher/minecraft/mod/tasks/ResourceFolderLoadTask.cpp

@@ -36,6 +36,7 @@
 
 #include "ResourceFolderLoadTask.h"
 
+#include "Application.h"
 #include "FileSystem.h"
 #include "minecraft/mod/MetadataHandler.h"
 
@@ -70,6 +71,9 @@ void ResourceFolderLoadTask::executeTask()
     m_resource_dir.refresh();
     for (auto entry : m_resource_dir.entryInfoList()) {
         auto filePath = entry.absoluteFilePath();
+        if (auto app = APPLICATION_DYN; app && app->checkQSavePath(filePath)) {
+            continue;
+        }
         auto newFilePath = FS::getUniqueResourceName(filePath);
         if (newFilePath != filePath) {
             FS::move(filePath, newFilePath);