zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-04-17 00:48:42 +00:00
Code Activity

refactor: use std::expected instead of custom implementation

Browse Source
This commit is contained in:
Jan Laupetin
2026-04-04 14:47:10 +02:00
parent bd6f42dc54
commit 4242c4a325
9 changed files with 124 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ZoneLoading/ZoneLoading.cpp
View File

@@ -11,19 +11,19 @@
using namespace std::string_literals;
namespace fs = std::filesystem;
result::Expected<std::unique_ptr<Zone>, std::string> ZoneLoading::LoadZone(const std::string& path,
std::optional<std::unique_ptr<ProgressCallback>> progressCallback)
std::expected<std::unique_ptr<Zone>, std::string> ZoneLoading::LoadZone(const std::string& path,
std::optional<std::unique_ptr<ProgressCallback>> progressCallback)
{
auto zoneName = fs::path(path).filename().replace_extension().string();
std::ifstream file(path, std::fstream::in | std::fstream::binary);
if (!file.is_open())
return result::Unexpected(std::format("Could not open file '{}'.", path));
return std::unexpected(std::format("Could not open file '{}'.", path));
ZoneHeader header{};
file.read(reinterpret_cast<char*>(&header), sizeof(header));
if (file.gcount() != sizeof(header))
return result::Unexpected(std::format("Failed to read zone header from file '{}'.", path));
return std::unexpected(std::format("Failed to read zone header from file '{}'.", path));
std::unique_ptr<ZoneLoader> zoneLoader;
for (auto game = 0u; game < static_cast<unsigned>(GameId::COUNT); game++)
@@ -37,14 +37,14 @@ result::Expected<std::unique_ptr<Zone>, std::string> ZoneLoading::LoadZone(const
}
if (!zoneLoader)
return result::Unexpected(std::format("Could not create factory for zone '{}'.", zoneName));
return std::unexpected(std::format("Could not create factory for zone '{}'.", zoneName));
auto loadedZone = zoneLoader->LoadZone(file);
file.close();
if (!loadedZone)
return result::Unexpected("Loading zone failed."s);
return std::unexpected("Loading zone failed."s);
return std::move(loadedZone);
}

6
src/ZoneLoading/ZoneLoading.h
View File

@@ -1,14 +1,14 @@
#pragma once
#include "Utils/ProgressCallback.h"
#include "Utils/Result.h"
#include "Zone/Zone.h"
#include <expected>
#include <string>
class ZoneLoading
{
public:
static result::Expected<std::unique_ptr<Zone>, std::string> LoadZone(const std::string& path,
std::optional<std::unique_ptr<ProgressCallback>> progressCallback);
static std::expected<std::unique_ptr<Zone>, std::string> LoadZone(const std::string& path,
std::optional<std::unique_ptr<ProgressCallback>> progressCallback);
};