refactor: move RP/TP validation to their respective utils

This makes it easier to validate individual resources, and allows the
logic to be used in other places in the future, if we need to.

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

launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp

@@ -28,14 +28,14 @@
 
 namespace ResourcePackUtils {
 
-bool process(ResourcePack& pack)
+bool process(ResourcePack& pack, ProcessingLevel level)
 {
     switch (pack.type()) {
         case ResourceType::FOLDER:
-            ResourcePackUtils::processFolder(pack);
+            ResourcePackUtils::processFolder(pack, level);
             return true;
         case ResourceType::ZIPFILE:
-            ResourcePackUtils::processZIP(pack);
+            ResourcePackUtils::processZIP(pack, level);
             return true;
         default:
             qWarning() << "Invalid type for resource pack parse task!";
@@ -43,7 +43,7 @@ bool process(ResourcePack& pack)
     }
 }
 
-void processFolder(ResourcePack& pack)
+void processFolder(ResourcePack& pack, ProcessingLevel level)
 {
     Q_ASSERT(pack.type() == ResourceType::FOLDER);
 
@@ -60,6 +60,9 @@ void processFolder(ResourcePack& pack)
         mcmeta_file.close();
     }
 
+    if (level == ProcessingLevel::BasicInfoOnly)
+        return;
+
     QFileInfo image_file_info(FS::PathCombine(pack.fileinfo().filePath(), "pack.png"));
     if (image_file_info.isFile()) {
         QFile mcmeta_file(image_file_info.filePath());
@@ -74,7 +77,7 @@ void processFolder(ResourcePack& pack)
     }
 }
 
-void processZIP(ResourcePack& pack)
+void processZIP(ResourcePack& pack, ProcessingLevel level)
 {
     Q_ASSERT(pack.type() == ResourceType::ZIPFILE);
 
@@ -98,6 +101,11 @@ void processZIP(ResourcePack& pack)
         file.close();
     }
 
+    if (level == ProcessingLevel::BasicInfoOnly) {
+        zip.close();
+        return;
+    }
+
     if (zip.setCurrentFile("pack.png")) {
         if (!file.open(QIODevice::ReadOnly)) {
             qCritical() << "Failed to open file in zip.";
@@ -138,6 +146,13 @@ void processPackPNG(ResourcePack& pack, QByteArray&& raw_data)
         qWarning() << "Failed to parse pack.png.";
     }
 }
+
+bool validate(QFileInfo file)
+{
+    ResourcePack rp{ file };
+    return ResourcePackUtils::process(rp, ProcessingLevel::BasicInfoOnly) && rp.valid();
+}
+
 }  // namespace ResourcePackUtils
 
 LocalResourcePackParseTask::LocalResourcePackParseTask(int token, ResourcePack& rp)

launcher/minecraft/mod/tasks/LocalResourcePackParseTask.h

@@ -26,13 +26,19 @@
 #include "tasks/Task.h"
 
 namespace ResourcePackUtils {
-bool process(ResourcePack& pack);
 
-void processZIP(ResourcePack& pack);
+enum class ProcessingLevel { Full, BasicInfoOnly };
-void processFolder(ResourcePack& pack);
+
+bool process(ResourcePack& pack, ProcessingLevel level = ProcessingLevel::Full);
+
+void processZIP(ResourcePack& pack, ProcessingLevel level = ProcessingLevel::Full);
+void processFolder(ResourcePack& pack, ProcessingLevel level = ProcessingLevel::Full);
 
 void processMCMeta(ResourcePack& pack, QByteArray&& raw_data);
 void processPackPNG(ResourcePack& pack, QByteArray&& raw_data);
+
+/** Checks whether a file is valid as a resource pack or not. */
+bool validate(QFileInfo file);
 }  // namespace ResourcePackUtils
 
 class LocalResourcePackParseTask : public Task {

launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp

@@ -28,14 +28,14 @@
 
 namespace TexturePackUtils {
 
-bool process(TexturePack& pack)
+bool process(TexturePack& pack, ProcessingLevel level)
 {
     switch (pack.type()) {
         case ResourceType::FOLDER:
-            TexturePackUtils::processFolder(pack);
+            TexturePackUtils::processFolder(pack, level);
             return true;
         case ResourceType::ZIPFILE:
-            TexturePackUtils::processZIP(pack);
+            TexturePackUtils::processZIP(pack, level);
             return true;
         default:
             qWarning() << "Invalid type for resource pack parse task!";
@@ -43,7 +43,7 @@ bool process(TexturePack& pack)
     }
 }
 
-void processFolder(TexturePack& pack)
+void processFolder(TexturePack& pack, ProcessingLevel level)
 {
     Q_ASSERT(pack.type() == ResourceType::FOLDER);
 
@@ -60,6 +60,9 @@ void processFolder(TexturePack& pack)
         mcmeta_file.close();
     }
 
+    if (level == ProcessingLevel::BasicInfoOnly)
+        return;
+
     QFileInfo image_file_info(FS::PathCombine(pack.fileinfo().filePath(), "pack.png"));
     if (image_file_info.isFile()) {
         QFile mcmeta_file(image_file_info.filePath());
@@ -74,7 +77,7 @@ void processFolder(TexturePack& pack)
     }
 }
 
-void processZIP(TexturePack& pack)
+void processZIP(TexturePack& pack, ProcessingLevel level)
 {
     Q_ASSERT(pack.type() == ResourceType::ZIPFILE);
 
@@ -98,6 +101,11 @@ void processZIP(TexturePack& pack)
         file.close();
     }
 
+    if (level == ProcessingLevel::BasicInfoOnly) {
+        zip.close();
+        return;
+    }
+
     if (zip.setCurrentFile("pack.png")) {
         if (!file.open(QIODevice::ReadOnly)) {
             qCritical() << "Failed to open file in zip.";
@@ -129,6 +137,13 @@ void processPackPNG(TexturePack& pack, QByteArray&& raw_data)
         qWarning() << "Failed to parse pack.png.";
     }
 }
+
+bool validate(QFileInfo file)
+{
+    TexturePack rp{ file };
+    return TexturePackUtils::process(rp, ProcessingLevel::BasicInfoOnly) && rp.valid();
+}
+
 }  // namespace TexturePackUtils
 
 LocalTexturePackParseTask::LocalTexturePackParseTask(int token, TexturePack& rp)

launcher/minecraft/mod/tasks/LocalTexturePackParseTask.h

@@ -27,13 +27,19 @@
 #include "tasks/Task.h"
 
 namespace TexturePackUtils {
-bool process(TexturePack& pack);
 
-void processZIP(TexturePack& pack);
+enum class ProcessingLevel { Full, BasicInfoOnly };
-void processFolder(TexturePack& pack);
+
+bool process(TexturePack& pack, ProcessingLevel level = ProcessingLevel::Full);
+
+void processZIP(TexturePack& pack, ProcessingLevel level = ProcessingLevel::Full);
+void processFolder(TexturePack& pack, ProcessingLevel level = ProcessingLevel::Full);
 
 void processPackTXT(TexturePack& pack, QByteArray&& raw_data);
 void processPackPNG(TexturePack& pack, QByteArray&& raw_data);
+
+/** Checks whether a file is valid as a texture pack or not. */
+bool validate(QFileInfo file);
 }  // namespace TexturePackUtils
 
 class LocalTexturePackParseTask : public Task {

launcher/ui/MainWindow.cpp

@@ -110,10 +110,8 @@
 #include "ui/dialogs/ImportResourcePackDialog.h"
 #include "ui/themes/ITheme.h"
 
-#include <minecraft/mod/ResourcePack.h>
 #include <minecraft/mod/ResourcePackFolderModel.h>
 #include <minecraft/mod/tasks/LocalResourcePackParseTask.h>
-#include <minecraft/mod/TexturePack.h>
 #include <minecraft/mod/TexturePackFolderModel.h>
 #include <minecraft/mod/tasks/LocalTexturePackParseTask.h>
 
@@ -1806,13 +1804,11 @@ void MainWindow::droppedURLs(QList<QUrl> urls)
     for (auto& url : urls) {
         if (url.isLocalFile()) {
             auto localFileName = url.toLocalFile();
-
+            QFileInfo localFileInfo(localFileName);
-            ResourcePack rp{ QFileInfo(localFileName) };
-            TexturePack tp{ QFileInfo(localFileName) };
 
             ImportResourcePackDialog dlg(this);
 
-            if (ResourcePackUtils::process(rp) && rp.valid()) {
+            if (ResourcePackUtils::validate(localFileInfo)) {
                 dlg.exec();
 
                 if (dlg.result() == QDialog::Accepted) {
@@ -1821,7 +1817,7 @@ void MainWindow::droppedURLs(QList<QUrl> urls)
                     auto instanceButBuffed = std::dynamic_pointer_cast<MinecraftInstance>(instance);
                     instanceButBuffed->resourcePackList()->installResource(localFileName);
                 }
-            } else if (TexturePackUtils::process(tp) && tp.valid()) {
+            } else if (TexturePackUtils::validate(localFileInfo)) {
                 dlg.exec();
 
                 if (dlg.result() == QDialog::Accepted) {