Setup libzippp archive loading

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16)
 
 set(CMAKE_GENERATOR_PLATFORM win32)
 
@@ -51,7 +51,7 @@ file(GLOB SOURCES
     "source/*.cpp"
     ${VERSION_RC}
     )
-
+target_compile_features(gMod PRIVATE cxx_std_23)
 target_link_libraries(gMod PRIVATE
     ${D3D9_LIB}
     ${D3DX9_LIB}

cmake/libzippp.cmake

@@ -25,6 +25,9 @@ endif()
 FetchContent_Populate(libzippp)
 
 add_library(libzippp)
+
+set(LIBZIPPP_ENABLE_ENCRYPTION ON)
+
 set(SOURCES
     "${libzippp_SOURCE_DIR}/src/libzippp.h"
     "${libzippp_SOURCE_DIR}/src/libzippp.cpp"

header/gMod_FileLoader.h

@@ -1,21 +1,23 @@
-#pragma once
+#pragma once
 
 #include <filesystem>
 #include <fstream>
 #include <vector>
 #include <string>
 #include <ranges>
-
+#include <streambuf>
 #include <libzippp.h>
 
 struct TpfEntry {
     std::string Name;
     std::string Entry; // Assuming ZipEntry is a string in your original code
     uint32_t CrcHash;
+    void* Data;
+    unsigned long long Size;
 };
 
 class gMod_FileLoader {
-    const std::string _fileName;
+    std::string _fileName;
     std::ifstream _stream;
     const std::vector<uint8_t> _tpfPassword{
         0x73, 0x2A, 0x63, 0x7D, 0x5F, 0x0A, 0xA6, 0xBD,
@@ -25,72 +27,21 @@ class gMod_FileLoader {
         0x77, 0x6E, 0x46, 0x47, 0x77, 0x49, 0x0C, 0x4B,
         0x46, 0x6F
     };
+    const std::string encodedPassword = std::string(_tpfPassword.begin(), _tpfPassword.end());
     std::vector<TpfEntry> entryCache;
     bool loaded;
 
 public:
-    gMod_FileLoader(const std::string& fileName)
-        : _fileName(std::filesystem::absolute(fileName).string()), _stream(_fileName, std::ios::binary), loaded(false) {
-        if (!_stream) {
-            throw std::runtime_error("Failed to open file: " + _fileName);
-        }
-    }
+    gMod_FileLoader(const std::string& fileName);
 
-    std::vector<TpfEntry> Load() {
-        if (!loaded) {
-            entryCache = GetContents();
-            loaded = true;
-        }
-
-        return entryCache;
-    }
+    std::vector<TpfEntry> Load();
 
 private:
-    std::vector<TpfEntry> GetContents() {
-        if (_fileName.ends_with(".tpf")) {
-            return GetTpfContents();
-        } else {
-            return GetFileContents();
-        }
-    }
+    std::vector<TpfEntry> GetContents();
 
-    std::vector<TpfEntry> GetTpfContents() {
-        std::vector<TpfEntry> entries;
+    std::vector<TpfEntry> GetTpfContents();
 
-        try {
-            // Open the zip file using libzippp
-            libzippp::ZipArchive zipArchive(_fileName);
+    std::vector<TpfEntry> GetFileContents();
 
-            // Iterate over the files in the zip archive
-            for (auto entry : zipArchive) {
-                if (entry.isFile()) {
-                    entries.push_back({ entry.getName(), entry.getName(), 0 }); // Assuming ZipEntry is a string
-                }
-            }
-        } catch (const std::exception& e) {
-            throw std::runtime_error("Failed to open zip file: " + _fileName);
-        }
-
-        return entries;
-    }
-
-    std::vector<TpfEntry> GetFileContents() {
-        std::vector<TpfEntry> entries;
-
-        try {
-            // Open the zip file using libzippp
-            libzippp::ZipArchive zipArchive(_fileName);
-
-            // Iterate over the files in the zip archive
-            for (auto entry : zipArchive) {
-                if (entry.isFile()) {
-                    entries.push_back({ entry.getName(), entry.getName(), 0 }); // Assuming ZipEntry is a string
-                }
-            }
-        } catch (const std::exception& e) {
-            throw std::runtime_error("Failed to open zip file: " + _fileName);
-        }
-
-        return entries;
-    }
+    void LoadEntries(libzippp::ZipArchive& archive, std::vector<TpfEntry>& entries);
 };

source/gMod_FileLoader.cpp

@@ -0,0 +1,71 @@
+#include "../header/gMod_FileLoader.h"
+#include <filesystem>
+
+gMod_FileLoader::gMod_FileLoader(const std::string& fileName) {
+    _fileName = std::filesystem::absolute(fileName).string();
+    _stream = std::ifstream(_fileName, std::ios::binary);
+    loaded = false;
+    if (!_stream) {
+        throw std::runtime_error("Failed to open file: " + _fileName);
+    }
+}
+
+std::vector<TpfEntry> gMod_FileLoader::Load() {
+    if (!loaded) {
+        entryCache = GetContents();
+        loaded = true;
+    }
+
+    return entryCache;
+}
+
+std::vector<TpfEntry> gMod_FileLoader::GetContents() {
+    if (_fileName.ends_with(".tpf")) {
+        return GetTpfContents();
+    }
+    else {
+        return GetFileContents();
+    }
+}
+
+std::vector<TpfEntry> gMod_FileLoader::GetTpfContents() {
+    std::vector<TpfEntry> entries;
+    try {
+        // Open the zip file using libzippp
+        libzippp::ZipArchive zipArchive(_fileName, encodedPassword);
+        zipArchive.open(); //ReadOnly and no consistency checks
+        LoadEntries(zipArchive, entries);
+    }
+    catch (const std::exception& e) {
+        throw std::runtime_error("Failed to open zip file: " + _fileName);
+    }
+
+    return entries;
+}
+
+std::vector<TpfEntry> gMod_FileLoader::GetFileContents() {
+    std::vector<TpfEntry> entries;
+
+    try {
+        // Open the zip file using libzippp
+        libzippp::ZipArchive zipArchive(_fileName);
+        zipArchive.open();
+        LoadEntries(zipArchive, entries);
+    }
+    catch (const std::exception& e) {
+        throw std::runtime_error("Failed to open zip file: " + _fileName);
+    }
+
+    return entries;
+}
+
+void gMod_FileLoader::LoadEntries(libzippp::ZipArchive& archive, std::vector<TpfEntry>& entries) {
+    // Iterate over the files in the zip archive
+    for (const auto& entry : archive.getEntries()) {
+        if (entry.isFile()) {
+            const auto dataPtr = entry.readAsBinary();
+            const auto size = entry.getSize();
+            entries.push_back({ entry.getName(), entry.getName(), 0, dataPtr, size }); // Assuming ZipEntry is a string
+        }
+    }
+}

source/uMod_TextureServer.cpp

@@ -625,15 +625,11 @@ void uMod_TextureServer::LoadModsFromFile(char* source)
             }
 
             const auto file = new gMod_FileLoader(line);
-            const auto result = file->GetContent();
-            if (!file->Textures.empty()) {
-                if (!result) {
-                    Message("MainLoop: WARNING! GetContent returned failure, but some textures have been loaded for %s\n", line);
-                }
-
-                Message("MainLoop: Texture count %d %s\n", file->Textures.size(), line);
-                for (auto& texture : file->Textures) {
-                    AddFile(texture.data.data(), texture.data.size(), texture.hash, true);
+            const auto entries = file->Load();
+            if (!entries.empty()) {
+                Message("MainLoop: Texture count %d %s\n", entries.size(), line);
+                for (const auto& entry : entries) {
+                    //AddFile(static_cast<char*>(entry.Data), static_cast<unsigned int>(entry.Size), )
                 }
 
                 PropagateUpdate(nullptr);