Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[IO]: Support fs_game mod folder (#913)

Browse Source
This commit is contained in:
Edo 2023-04-08 12:22:50 +02:00 committed by GitHub
parent c99d81d8cc
commit 6198c0bac5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/Components/Modules/GSC/IO.cpp
View File

@ -8,7 +8,7 @@ namespace Components::GSC
FILE* IO::openScriptIOFileHandle; FILE* IO::openScriptIOFileHandle;
std::filesystem::path IO::Path; std::filesystem::path IO::DefaultDestPath;
bool IO::ValidatePath(const char* function, const char* path) bool IO::ValidatePath(const char* function, const char* path)
{ {
@ -24,6 +24,17 @@ namespace Components::GSC
return true; return true;
} }
std::filesystem::path IO::BuildPath(const char* path)
{
const std::filesystem::path fsGame = (*Game::fs_gameDirVar)->current.string;
if (!fsGame.empty())
{
return fsGame / "scriptdata"s / path;
}
return DefaultDestPath / "scriptdata"s / path;
}
void IO::GScr_OpenFile() void IO::GScr_OpenFile()
{ {
const auto* filepath = Game::Scr_GetString(0); const auto* filepath = Game::Scr_GetString(0);
@ -49,10 +60,10 @@ namespace Components::GSC
return; return;
} }
const auto scriptData = Path / "scriptdata"s / filepath; const auto dest = BuildPath(filepath);
_set_errno(0); _set_errno(0);
const auto result = fopen_s(&openScriptIOFileHandle, scriptData.string().data(), "r"); const auto result = fopen_s(&openScriptIOFileHandle, dest.string().data(), "r");
if (result || !openScriptIOFileHandle) if (result || !openScriptIOFileHandle)
{ {
Logger::PrintError(Game::CON_CHANNEL_PARSERSCRIPT, "OpenFile failed. '{}'", result); Logger::PrintError(Game::CON_CHANNEL_PARSERSCRIPT, "OpenFile failed. '{}'", result);
@ -119,8 +130,8 @@ namespace Components::GSC
} }
const auto append = mode == "append"s; const auto append = mode == "append"s;
const auto scriptData = Path / "scriptdata"s / filepath; const auto dest = BuildPath(filepath);
Utils::IO::WriteFile(scriptData.string(), text, append); Utils::IO::WriteFile(dest.string(), text, append);
}); });
Script::AddFunction("FileRead", [] // gsc: FileRead(<filepath>) Script::AddFunction("FileRead", [] // gsc: FileRead(<filepath>)
@ -131,12 +142,12 @@ namespace Components::GSC
return; return;
} }
const auto scriptData = Path / "scriptdata"s / filepath; const auto dest = BuildPath(filepath);
std::string file; std::string file;
if (!Utils::IO::ReadFile(scriptData.string(), &file)) if (!Utils::IO::ReadFile(dest.string(), &file))
{ {
Logger::PrintError(Game::CON_CHANNEL_PARSERSCRIPT, "FileRead: file '{}' not found!\n", scriptData.string()); Logger::PrintError(Game::CON_CHANNEL_PARSERSCRIPT, "FileRead: file '{}' not found!\n", dest.string());
return; return;
} }
@ -152,8 +163,8 @@ namespace Components::GSC
return; return;
} }
const auto scriptData = Path / "scriptdata"s / filepath; const auto dest = BuildPath(filepath);
Game::Scr_AddBool(Utils::IO::FileExists(scriptData.string())); Game::Scr_AddBool(Utils::IO::FileExists(dest.string()));
}); });
Script::AddFunction("FileRemove", [] // gsc: FileRemove(<filepath>) Script::AddFunction("FileRemove", [] // gsc: FileRemove(<filepath>)
@ -164,8 +175,8 @@ namespace Components::GSC
return; return;
} }
const auto scriptData = Path / "scriptdata"s / filepath; const auto dest = BuildPath(filepath);
Game::Scr_AddBool(Utils::IO::RemoveFile(scriptData.string())); Game::Scr_AddBool(Utils::IO::RemoveFile(dest.string()));
}); });
Script::AddFunction("FileRename", [] // gsc: FileRename(<filepath>, <filepath>) Script::AddFunction("FileRename", [] // gsc: FileRename(<filepath>, <filepath>)
@ -177,8 +188,8 @@ namespace Components::GSC
return; return;
} }
const auto from = Path / "scriptdata"s / filepath; const auto from = BuildPath(filepath);
const auto to = Path / "scriptdata"s / destpath; const auto to = BuildPath(destpath);
std::error_code err; std::error_code err;
std::filesystem::rename(from, to, err); std::filesystem::rename(from, to, err);
@ -201,8 +212,8 @@ namespace Components::GSC
return; return;
} }
const auto from = Path / "scriptdata"s / filepath; const auto from = BuildPath(filepath);
const auto to = Path / "scriptdata"s / destpath; const auto to = BuildPath(destpath);
std::error_code err; std::error_code err;
std::filesystem::copy(from, to, err); std::filesystem::copy(from, to, err);
@ -222,7 +233,7 @@ namespace Components::GSC
IO::IO() IO::IO()
{ {
openScriptIOFileHandle = nullptr; openScriptIOFileHandle = nullptr;
Path = "userraw"s; DefaultDestPath = "userraw"s;
AddScriptFunctions(); AddScriptFunctions();

3
src/Components/Modules/GSC/IO.hpp
View File

@ -12,9 +12,10 @@ namespace Components::GSC
static FILE* openScriptIOFileHandle; static FILE* openScriptIOFileHandle;
static std::filesystem::path Path; static std::filesystem::path DefaultDestPath;
static bool ValidatePath(const char* function, const char* path); static bool ValidatePath(const char* function, const char* path);
static std::filesystem::path BuildPath(const char* path);
static void GScr_OpenFile(); static void GScr_OpenFile();
static void GScr_ReadStream(); static void GScr_ReadStream();