Skip to content

Simplify FS.CreateDirectory return value #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kipstz wants to merge 2 commits into
base: minor
Choose a base branch
from
+14 −19
Open

Simplify FS.CreateDirectory return value #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8aec070
Simplify FS.CreateDirectory return value
Kipstz Dec 24, 2025
46c8804
Merge branch 'BeamMP:minor' into simplify-fs-createdirectory-return
Kipstz Dec 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/LuaAPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#pragma once

#include "TLuaEngine.h"
#include <optional>
#include <tuple>

namespace LuaAPI {
Expand Down Expand Up @@ -54,7 +55,7 @@ namespace MP {
}

namespace FS {
std::pair<bool, std::string> CreateDirectory(const std::string& Path);
std::optional<std::string> CreateDirectory(const std::string& Path);
std::pair<bool, std::string> Remove(const std::string& Path);
std::pair<bool, std::string> Rename(const std::string& Path, const std::string& NewPath);
std::pair<bool, std::string> Copy(const std::string& Path, const std::string& NewPath);
Expand Down
30 changes: 12 additions & 18 deletions src/LuaAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,40 +452,34 @@ static std::pair<bool, std::string> FSWrapper(FnT Fn, ArgsT&&... Args) {
return Result;
}

std::pair<bool, std::string> LuaAPI::FS::CreateDirectory(const std::string& Path) {
std::optional<std::string> LuaAPI::FS::CreateDirectory(const std::string& Path) {
std::error_code errc;
std::pair<bool, std::string> Result;
fs::create_directories(Path, errc);
Result.first = errc == std::error_code {};
if (!Result.first) {
Result.second = errc.message();
if (errc != std::error_code {}) {
return errc.message();
}
return Result;
return std::nullopt;
}

TEST_CASE("LuaAPI::FS::CreateDirectory") {
std::string TestDir = "beammp_test_dir";
fs::remove_all(TestDir);
SUBCASE("Single level dir") {
const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir);
CHECK(Ok);
CHECK(Err == "");
const auto Err = LuaAPI::FS::CreateDirectory(TestDir);
CHECK(!Err.has_value());
CHECK(fs::exists(TestDir));
}
SUBCASE("Multi level dir") {
const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir + "/a/b/c");
CHECK(Ok);
CHECK(Err == "");
const auto Err = LuaAPI::FS::CreateDirectory(TestDir + "/a/b/c");
CHECK(!Err.has_value());
CHECK(fs::exists(TestDir + "/a/b/c"));
}
SUBCASE("Already exists") {
const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir);
CHECK(Ok);
CHECK(Err == "");
const auto Err = LuaAPI::FS::CreateDirectory(TestDir);
CHECK(!Err.has_value());
CHECK(fs::exists(TestDir));
const auto [Ok2, Err2] = LuaAPI::FS::CreateDirectory(TestDir);
CHECK(Ok2);
CHECK(Err2 == "");
const auto Err2 = LuaAPI::FS::CreateDirectory(TestDir);
CHECK(!Err2.has_value());
}
fs::remove_all(TestDir);
}
Expand Down
Loading