loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Refactor conversion from Rust strings to C++ paths

Browse Source
This commit is contained in:
Oliver Hamlet
2025-05-08 19:27:12 +01:00
parent 299782705a
commit 4fbc075c71
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/src/api/game.cpp
+7 -5
View File
@@ -67,6 +67,10 @@ loot::rust::GameType convert(loot::GameType gameType) {
}
}
std::filesystem::path to_path(const rust::String& string) {
return std::filesystem::u8path(string.begin(), string.end());
}
rust::Box<loot::rust::Game> constructGame(
const loot::GameType gameType,
const std::filesystem::path& gamePath,
@@ -115,9 +119,8 @@ DatabaseInterface& Game::GetDatabase() { return database_; }
std::vector<std::filesystem::path> Game::GetAdditionalDataPaths() const {
try {
std::vector<std::filesystem::path> paths;
for (const auto& path_str : game_->additional_data_paths()) {
paths.push_back(
std::filesystem::u8path(path_str.begin(), path_str.end()));
for (const auto& path_string : game_->additional_data_paths()) {
paths.push_back(to_path(path_string));
}
return paths;
@@ -225,8 +228,7 @@ bool Game::IsLoadOrderAmbiguous() const {
std::filesystem::path Game::GetActivePluginsFilePath() const {
try {
const auto path_string = game_->active_plugins_file_path();
return std::filesystem::u8path(path_string.begin(), path_string.end());
return to_path(game_->active_plugins_file_path());
} catch (const ::rust::Error& e) {
std::rethrow_exception(mapError(e));
}