sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/File: Add DecodeOpenMode

Browse Source
This commit is contained in:
Lynix
2023-12-25 19:51:19 +01:00
parent 4065fbfb1a
commit 7cd1b32e95
3 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/Assimp/CustomStream.cpp
View File

@@ -84,38 +84,16 @@ aiFile* StreamOpener(aiFileIO* fileIO, const char* filePath, const char* openMod
{
ErrorFlags errFlags({}, ~ErrorMode::ThrowException);
///TODO: Move to File::DecodeOpenMode
OpenModeFlags openModeEnum = 0;
Result<OpenModeFlags, std::string> openModes = File::DecodeOpenMode(openMode);
if (std::strchr(openMode, 'r'))
if (openModes.IsErr())
{
openModeEnum |= OpenMode::Read;
if (std::strchr(openMode, '+'))
openModeEnum |= OpenMode_ReadWrite | OpenMode::MustExist;
}
else if (std::strchr(openMode, 'w'))
{
openModeEnum |= OpenMode::Write | OpenMode::Truncate;
if (std::strchr(openMode, '+'))
openModeEnum |= OpenMode::Read;
}
else if (std::strchr(openMode, 'a'))
{
openModeEnum |= OpenMode::Write | OpenMode::Append;
if (std::strchr(openMode, '+'))
openModeEnum |= OpenMode::Read;
}
else
{
NazaraErrorFmt("unhandled/invalid openmode: {0} for file {1}", openMode, filePath);
NazaraErrorFmt("{0} for file {1}", openModes.GetError(), filePath);
return nullptr;
}
if (!std::strchr(openMode, 'b'))
openModeEnum |= OpenMode::Text;
std::unique_ptr<File> file = std::make_unique<File>();
if (!file->Open(filePath, openModeEnum))
if (!file->Open(filePath, openModes.GetValue()))
return nullptr;
stream = reinterpret_cast<char*>(file.release());