Fixed LUA gamepath

Author: dankmolot

source/lua_utils.cpp

@@ -1,6 +1,7 @@
 #include "lua_utils.hpp"
 #include <string>
 #include <string_view>
+#include <GarrysMod/Lua/LuaInterface.h>
 
 namespace AsyncIO::LuaUtils {
     void FindValue(GarrysMod::Lua::ILuaBase* LUA, std::string_view path) {
@@ -9,7 +10,7 @@ namespace AsyncIO::LuaUtils {
         do {
             firstPos = endPos;
             endPos = path.find(".", endPos) + 1;
-            std::string name{ path.substr(firstPos, endPos != 0 ? endPos - firstPos - 1 : path.size()) };
+            std::string name{path.substr(firstPos, endPos != 0 ? endPos - firstPos - 1 : path.size())};
 
             LUA->GetField(firstPos == 0 ? GarrysMod::Lua::INDEX_GLOBAL : -1, name.c_str());
             if (firstPos != 0) LUA->Remove(-2);
@@ -29,4 +30,9 @@ namespace AsyncIO::LuaUtils {
         LUA->Remove(-1 - results);
         return 0;
     }
+
+    const char* GetGamePath(GarrysMod::Lua::ILuaBase* LUA, const char* gamePath) {
+        if (strcmp(gamePath, "LUA") == 0) return reinterpret_cast<GarrysMod::Lua::ILuaInterface*>(LUA)->GetPathID();
+        return gamePath;
+    }
 }

source/lua_utils.hpp

@@ -11,6 +11,9 @@ namespace AsyncIO::LuaUtils {
 
     // Runs a function with given arguments on the stack. If function is nil, then just pushes nils as results and pops everything else
     int RunFunction(GarrysMod::Lua::ILuaBase* LUA, int args, int results);
+
+    // Converts LUA gamepath to filesystem gamepath
+    const char* GetGamePath(GarrysMod::Lua::ILuaBase* LUA, const char* gamePath);
 }
 
 #endif // ASYNCIO_LUAQUICKS

source/main.cpp

@@ -62,8 +62,7 @@ namespace Lua {
                     LuaUtils::RunFunction(LUA, 4, 0);
 
                     MemAlloc_Free(data);
-                }
-                else {
+                } else {
                     LUA->PushNumber(FSASYNC_ERR_NOT_MINE);
                     LuaUtils::RunFunction(LUA, 3, 0);
                 }
@@ -147,14 +146,14 @@ namespace Lua {
 
     LUA_FUNCTION(AsyncRead) {
         std::string fileName = LUA->CheckString(1);
-        std::string gamePath = LUA->CheckString(2);
+        const char* gamePath = LUA->CheckString(2);
 
         if (!PathUtils::FixPath(fileName)) {
             LUA->PushNumber(FSASYNC_ERR_FILEOPEN);
             return 1;
         }
 
-        auto task = std::make_shared<AsyncReadTask>(fileName, gamePath);
+        auto task = std::make_shared<AsyncReadTask>(fileName, LuaUtils::GetGamePath(LUA, gamePath));
         if (LUA->IsType(3, GarrysMod::Lua::Type::Function)) {
             LUA->Push(3);
             task->callbackRef = LUA->ReferenceCreate();
@@ -193,14 +192,14 @@ GMOD_MODULE_OPEN() {
         LUA->Pop();
         LUA->CreateTable();
     }
-        LUA->PushCFunction(Lua::AsyncAppend);
-        LUA->SetField(-2, "AsyncAppend");
+    LUA->PushCFunction(Lua::AsyncAppend);
+    LUA->SetField(-2, "AsyncAppend");
 
-        LUA->PushCFunction(Lua::AsyncWrite);
-        LUA->SetField(-2, "AsyncWrite");
+    LUA->PushCFunction(Lua::AsyncWrite);
+    LUA->SetField(-2, "AsyncWrite");
 
-        LUA->PushCFunction(Lua::AsyncRead);
-        LUA->SetField(-2, "AsyncRead");
+    LUA->PushCFunction(Lua::AsyncRead);
+    LUA->SetField(-2, "AsyncRead");
     LUA->SetField(GarrysMod::Lua::INDEX_GLOBAL, "asyncio");
 
     return 0;