fix(gsc): fs_read checks multiple files for includes

include/xsk/gsc/context.hpp

@@ -18,7 +18,7 @@ namespace xsk::gsc
 class context
 {
 public:
-    using fs_callback = std::function<std::pair<buffer, std::vector<u8>>(std::string const&)>;
+    using fs_callback = std::function<std::pair<buffer, std::vector<u8>>(std::string const&, context&)>;
 
     context(props props, engine engine, endian endian, system system, u32 str_count);
 

src/gsc/context.cpp

@@ -682,7 +682,7 @@ auto context::load_header(std::string const& name) -> std::tuple<std::string con
         return { &itr->first, reinterpret_cast<char const*>(itr->second.data()), itr->second.size() };
     }
 
-    auto data = fs_callback_(name);
+    auto data = fs_callback_(name, *this);
 
     if (data.first.data == nullptr && data.first.size == 0 && !data.second.empty())
     {
@@ -711,7 +711,7 @@ auto context::load_include(std::string const& name) -> bool
         if (include_cache_.contains(name))
             return true;
 
-        auto file = fs_callback_(name);
+        auto file = fs_callback_(name, *this);
 
         if ((file.first.data == nullptr || file.first.size == 0) && file.second.empty())
             throw std::runtime_error("empty file");

src/tool/main.cpp

@@ -420,16 +420,42 @@ auto rename_file(game game, mach mach, fs::path file, fs::path rel) -> void
 
 std::unordered_map<std::string, std::vector<std::uint8_t>> files;
 
-auto fs_read(std::string const& name) -> std::pair<buffer, std::vector<u8>>
+auto fs_read(std::string const& name, context& ctx) -> std::pair<buffer, std::vector<u8>>
 {
-    auto data = utils::file::read(fs::path{ name });
+    auto path = fs::path{ name };
+
+    if (!utils::file::exists(path) && !path.has_extension())
+    {
+        auto id = ctx.token_id(name);
+        if (id > 0)
+        {
+            path = fs::path{ std::to_string(id) + ".gscbin" };
+        }
+
+        if (!utils::file::exists(path))
+        {
+            path = fs::path{ name + ".gscbin" };
+        }
+
+        if (!utils::file::exists(path))
+        {
+            path = fs::path{ name + ".gsh" };
+        }
+
+        if (!utils::file::exists(path))
+        {
+            path = fs::path{ name + ".gsc" };
+        }
+    }
+
+    auto data = utils::file::read(path);
 
-    if(name.ends_with(".gscbin") || (!name.ends_with(".gsh") && !name.ends_with(".gsc")))
+    if (path.extension().string() == ".gscbin" || (path.extension().string() != ".gsh" && path.extension().string() != ".gsc"))
     {
         asset s;
         s.deserialize(data);
         auto stk = utils::zlib::decompress(s.buffer, s.len);
-        auto res = files.insert({ name, std::move(s.bytecode) });
+        auto res = files.insert({ path.filename().string(), std::move(s.bytecode)});
 
         if (res.second)
         {