zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-30 00:07:47 +00:00
Code Activity

chore: pass ZoneLoading error as result

Browse Source
This commit is contained in:
Jan Laupetin
2025-10-11 15:28:19 +01:00
parent 098be53559
commit b27b7e77bd
9 changed files with 181 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ModMan/Context/FastFileContext.cpp
View File

@@ -2,11 +2,11 @@
#include "ZoneLoading.h"
std::optional<Zone*> FastFileContext::LoadFastFile(const std::string& path)
result::Expected<Zone*, std::string> FastFileContext::LoadFastFile(const std::string& path)
{
auto zone = ZoneLoading::LoadZone(path);
if (!zone)
return std::nullopt;
return result::Unexpected(std::move(zone.error()));
return m_loaded_zones.emplace_back(std::move(zone)).get();
return m_loaded_zones.emplace_back(std::move(*zone)).get();
}

5
src/ModMan/Context/FastFileContext.h
View File

@@ -1,14 +1,15 @@
#pragma once
#include "Utils/Result.h"
#include "Zone/Zone.h"
#include <memory>
#include <optional>
#include <vector>
class FastFileContext
{
public:
std::optional<Zone*> LoadFastFile(const std::string& path);
result::Expected<Zone*, std::string> LoadFastFile(const std::string& path);
std::vector<std::unique_ptr<Zone>> m_loaded_zones;
};

6
src/ModMan/Web/Binds/FastFileBinds.cpp
View File

@@ -10,7 +10,7 @@ namespace
ModManContext::Get().m_db_thread.Dispatch(
[&wv, id, path]
{
const auto maybeZone = ModManContext::Get().m_fast_file.LoadFastFile(path);
auto maybeZone = ModManContext::Get().m_fast_file.LoadFastFile(path);
if (maybeZone)
{
@@ -19,8 +19,8 @@ namespace
}
else
{
con::warn("Failed to load zone \"{}\"", path);
ui::PromiseReject(wv, id, false);
con::warn("Failed to load zone \"{}\": {}", path, maybeZone.error());
ui::PromiseReject(wv, id, std::move(maybeZone).error());
}
});
}