build: Always extract magic file database

WerWolv · Dec 28, 2023 · 03dc26d · 03dc26d
1 parent b64bb3b
commit 03dc26d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/plugins/builtin/CMakeLists.txt b/plugins/builtin/CMakeLists.txt
@@ -4,7 +4,7 @@ include(ImHexPlugin)
 
 find_file(DEFAULT_MAGIC_FILE_PATH magic.mgc HINTS ${MAGIC_INCLUDE_DIRS}/../share/misc)
 if (DEFAULT_MAGIC_FILE_PATH)
-    add_romfs_resource(${DEFAULT_MAGIC_FILE_PATH} auto_extract/magic/magic.mgc)
+    add_romfs_resource(${DEFAULT_MAGIC_FILE_PATH} always_auto_extract/magic/magic.mgc)
 endif ()
 
 add_imhex_plugin(

diff --git a/plugins/builtin/source/content/file_extraction.cpp b/plugins/builtin/source/content/file_extraction.cpp
@@ -6,23 +6,32 @@
 namespace hex::plugin::builtin {
 
     void extractBundledFiles() {
-        for (const auto &romfsPath : romfs::list("auto_extract")) {
-            for (const auto &imhexPath : fs::getDataPaths()) {
-                const auto path = imhexPath / std::fs::relative(romfsPath, "auto_extract");
-                if (wolv::io::fs::exists(path))
-                    continue;
+        constexpr static std::array<std::pair<std::string_view, bool>, 2> Paths = {
+            {
+                { "auto_extract", false },
+                { "always_auto_extract", true }
+            }
+        };
 
-                wolv::io::File file(path, wolv::io::File::Mode::Create);
-                if (!file.isValid())
-                    continue;
+        for (const auto [extractFolder, alwaysExtract] : Paths) {
+            for (const auto &romfsPath : romfs::list(extractFolder)) {
+                for (const auto &imhexPath : fs::getDataPaths()) {
+                    const auto path = imhexPath / std::fs::relative(romfsPath, extractFolder);
+                    if (!alwaysExtract && wolv::io::fs::exists(path))
+                        continue;
 
-                auto data = romfs::get(romfsPath).span<u8>();
-                file.writeBuffer(data.data(), data.size());
+                    wolv::io::File file(path, wolv::io::File::Mode::Create);
+                    if (!file.isValid())
+                        continue;
 
-                if (file.getSize() == data.size())
-                    break;
-            }
+                    auto data = romfs::get(romfsPath).span<u8>();
+                    file.writeBuffer(data.data(), data.size());
 
+                    if (file.getSize() == data.size())
+                        break;
+                }
+
+            }
         }
     }