feat: validate world saves

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

15 files changed, 195 insertions, 4 deletions

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index c12e6740..853e1c03 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -339,6 +339,10 @@ set(MINECRAFT_SOURCES
     minecraft/mod/ResourcePackFolderModel.cpp
     minecraft/mod/TexturePack.h
     minecraft/mod/TexturePack.cpp
+    minecraft/mod/ShaderPack.h
+    minecraft/mod/ShaderPack.cpp
+    minecraft/mod/WorldSave.h
+    minecraft/mod/WorldSave.cpp
     minecraft/mod/TexturePackFolderModel.h
     minecraft/mod/TexturePackFolderModel.cpp
     minecraft/mod/ShaderPackFolderModel.h
@@ -355,6 +359,10 @@ set(MINECRAFT_SOURCES
     minecraft/mod/tasks/LocalResourcePackParseTask.cpp
     minecraft/mod/tasks/LocalTexturePackParseTask.h
     minecraft/mod/tasks/LocalTexturePackParseTask.cpp
+    minecraft/mod/tasks/LocalShaderPackParseTask.h
+    minecraft/mod/tasks/LocalShaderPackParseTask.cpp
+    minecraft/mod/tasks/LocalWorldSaveParseTask.h
+    minecraft/mod/tasks/LocalWorldSaveParseTask.cpp
 
     # Assets
     minecraft/AssetsUtils.h
diff --git a/launcher/minecraft/mod/ShaderPack.h b/launcher/minecraft/mod/ShaderPack.h
index e6ee0757..a0dad7a1 100644
--- a/launcher/minecraft/mod/ShaderPack.h
+++ b/launcher/minecraft/mod/ShaderPack.h
@@ -39,7 +39,7 @@
 
 #include <QMutex>
 
-enum ShaderPackFormat {
+enum class ShaderPackFormat {
 	VALID,
 	INVALID
 };
diff --git a/launcher/minecraft/mod/WorldSave.h b/launcher/minecraft/mod/WorldSave.h
index f48f42b9..f703f34c 100644
--- a/launcher/minecraft/mod/WorldSave.h
+++ b/launcher/minecraft/mod/WorldSave.h
@@ -27,7 +27,7 @@
 
 class Version;
 
-enum WorldSaveFormat {
+enum class WorldSaveFormat {
 	SINGLE,
 	MULTI,
 	INVALID
diff --git a/launcher/minecraft/mod/tasks/LocalWorldSaveParseTask.cpp b/launcher/minecraft/mod/tasks/LocalWorldSaveParseTask.cpp
index 5405d308..b7f2420a 100644
--- a/launcher/minecraft/mod/tasks/LocalWorldSaveParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalWorldSaveParseTask.cpp
@@ -121,6 +121,9 @@ bool processZIP(WorldSave& save, ProcessingLevel level)
 
     auto [ found, save_dir_name, found_saves_dir ] = contains_level_dat(zip);
 
+    if (save_dir_name.endsWith("/")) {
+        save_dir_name.chop(1);
+    }
     
     if (!found) {
         return false;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index be33b8db..9f84a9a7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -30,6 +30,12 @@ ecm_add_test(TexturePackParse_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERS
 ecm_add_test(DataPackParse_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME DataPackParse)
 
+ecm_add_test(ShaderPackParse_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+    TEST_NAME ShaderPackParse)
+
+ecm_add_test(WorldSaveParse_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
+    TEST_NAME WorldSaveParse)
+
 ecm_add_test(ParseUtils_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME ParseUtils)
 
diff --git a/tests/DataPackParse_test.cpp b/tests/DataPackParse_test.cpp
index 7307035f..61ce1e2b 100644
--- a/tests/DataPackParse_test.cpp
+++ b/tests/DataPackParse_test.cpp
@@ -1,7 +1,10 @@
+// SPDX-FileCopyrightText: 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
+//
 // SPDX-License-Identifier: GPL-3.0-only
+
 /*
- *  PolyMC - Minecraft Launcher
- *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/tests/ShaderPackParse_test.cpp b/tests/ShaderPackParse_test.cpp
new file mode 100644
index 00000000..7df105c6
--- /dev/null
+++ b/tests/ShaderPackParse_test.cpp
@@ -0,0 +1,77 @@
+
+// SPDX-FileCopyrightText: 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <QTest>
+#include <QTimer>
+
+#include <FileSystem.h>
+
+#include <minecraft/mod/ShaderPack.h>
+#include <minecraft/mod/tasks/LocalShaderPackParseTask.h>
+
+class ShaderPackParseTest : public QObject {
+    Q_OBJECT
+
+    private slots:
+    void test_parseZIP()
+    {
+        QString source = QFINDTESTDATA("testdata/ShaderPackParse");
+
+        QString zip_sp = FS::PathCombine(source, "shaderpack1.zip");
+        ShaderPack pack { QFileInfo(zip_sp) };
+
+        bool valid = ShaderPackUtils::processZIP(pack);
+
+        QVERIFY(pack.packFormat() == ShaderPackFormat::VALID);
+        QVERIFY(valid == true);
+    }
+
+    void test_parseFolder()
+    {
+        QString source = QFINDTESTDATA("testdata/ShaderPackParse");
+
+        QString folder_sp = FS::PathCombine(source, "shaderpack2");
+        ShaderPack pack { QFileInfo(folder_sp) };
+
+        bool valid = ShaderPackUtils::processFolder(pack);
+
+        QVERIFY(pack.packFormat() == ShaderPackFormat::VALID);
+        QVERIFY(valid == true);
+    }
+
+    void test_parseZIP2()
+    {
+        QString source = QFINDTESTDATA("testdata/ShaderPackParse");
+
+        QString folder_sp = FS::PathCombine(source, "shaderpack3.zip");
+        ShaderPack pack { QFileInfo(folder_sp) };
+
+        bool valid = ShaderPackUtils::process(pack);
+
+        QVERIFY(pack.packFormat() == ShaderPackFormat::INVALID);
+        QVERIFY(valid == false);
+    }
+};
+
+QTEST_GUILESS_MAIN(ShaderPackParseTest)
+
+#include "ShaderPackParse_test.moc"
diff --git a/tests/WorldSaveParse_test.cpp b/tests/WorldSaveParse_test.cpp
new file mode 100644
index 00000000..4a8c3d29
--- /dev/null
+++ b/tests/WorldSaveParse_test.cpp
@@ -0,0 +1,94 @@
+
+// SPDX-FileCopyrightText: 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <QTest>
+#include <QTimer>
+
+#include <FileSystem.h>
+
+#include <minecraft/mod/WorldSave.h>
+#include <minecraft/mod/tasks/LocalWorldSaveParseTask.h>
+
+class WorldSaveParseTest : public QObject {
+    Q_OBJECT
+
+    private slots:
+    void test_parseZIP()
+    {
+        QString source = QFINDTESTDATA("testdata/WorldSaveParse");
+
+        QString zip_ws = FS::PathCombine(source, "minecraft_save_1.zip") ;
+        WorldSave save { QFileInfo(zip_ws) };
+
+        bool valid = WorldSaveUtils::processZIP(save);
+
+        QVERIFY(save.saveFormat() == WorldSaveFormat::SINGLE);
+        QVERIFY(save.saveDirName() == "world_1");
+        QVERIFY(valid == true);
+    }
+  
+    void test_parse_ZIP2()
+    {
+        QString source = QFINDTESTDATA("testdata/WorldSaveParse");
+
+        QString zip_ws = FS::PathCombine(source, "minecraft_save_2.zip") ;
+        WorldSave save { QFileInfo(zip_ws) };
+
+        bool valid = WorldSaveUtils::processZIP(save);
+
+        QVERIFY(save.saveFormat() == WorldSaveFormat::MULTI);
+        QVERIFY(save.saveDirName() == "world_2");
+        QVERIFY(valid == true);
+    }
+  
+    void test_parseFolder()
+    {
+        QString source = QFINDTESTDATA("testdata/WorldSaveParse");
+
+        QString folder_ws = FS::PathCombine(source, "minecraft_save_3");
+        WorldSave save { QFileInfo(folder_ws) };
+
+        bool valid = WorldSaveUtils::processFolder(save);
+
+        QVERIFY(save.saveFormat() == WorldSaveFormat::SINGLE);
+        QVERIFY(save.saveDirName() == "world_3");
+        QVERIFY(valid == true);
+    }
+
+    void test_parseFolder2()
+    {
+        QString source = QFINDTESTDATA("testdata/WorldSaveParse");
+
+        QString folder_ws = FS::PathCombine(source, "minecraft_save_4");
+        WorldSave save { QFileInfo(folder_ws) };
+
+        bool valid = WorldSaveUtils::process(save);
+
+        QVERIFY(save.saveFormat() == WorldSaveFormat::MULTI);
+        QVERIFY(save.saveDirName() == "world_4");
+        QVERIFY(valid == true);
+    }
+};
+
+QTEST_GUILESS_MAIN(WorldSaveParseTest)
+
+#include "WorldSaveParse_test.moc"
diff --git a/tests/testdata/ShaderPackParse/shaderpack1.zip b/tests/testdata/ShaderPackParse/shaderpack1.zip
new file mode 100644
index 00000000..9a8fb186
--- /dev/null
+++ b/tests/testdata/ShaderPackParse/shaderpack1.zip
diff --git a/tests/testdata/ShaderPackParse/shaderpack2/shaders/shaders.properties b/tests/testdata/ShaderPackParse/shaderpack2/shaders/shaders.properties
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/testdata/ShaderPackParse/shaderpack2/shaders/shaders.properties
diff --git a/tests/testdata/ShaderPackParse/shaderpack3.zip b/tests/testdata/ShaderPackParse/shaderpack3.zip
new file mode 100644
index 00000000..dbec042d
--- /dev/null
+++ b/tests/testdata/ShaderPackParse/shaderpack3.zip
diff --git a/tests/testdata/WorldSaveParse/minecraft_save_1.zip b/tests/testdata/WorldSaveParse/minecraft_save_1.zip
new file mode 100644
index 00000000..832a243d
--- /dev/null
+++ b/tests/testdata/WorldSaveParse/minecraft_save_1.zip
diff --git a/tests/testdata/WorldSaveParse/minecraft_save_2.zip b/tests/testdata/WorldSaveParse/minecraft_save_2.zip
new file mode 100644
index 00000000..6c895176
--- /dev/null
+++ b/tests/testdata/WorldSaveParse/minecraft_save_2.zip
diff --git a/tests/testdata/WorldSaveParse/minecraft_save_3/world_3/level.dat b/tests/testdata/WorldSaveParse/minecraft_save_3/world_3/level.dat
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/testdata/WorldSaveParse/minecraft_save_3/world_3/level.dat
diff --git a/tests/testdata/WorldSaveParse/minecraft_save_4/saves/world_4/level.dat b/tests/testdata/WorldSaveParse/minecraft_save_4/saves/world_4/level.dat
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/testdata/WorldSaveParse/minecraft_save_4/saves/world_4/level.dat