zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-09-01 06:27:26 +00:00
Code Activity

Merge pull request #193 from Laupetin/feature/improve-info-string-logging

Browse Source 
feat: improve info string logging
This commit is contained in:
Jan
2024-05-12 22:52:10 +02:00
committed by GitHub
parent 30394e6a4c 3efd9534fb
commit f2628fcda4
12 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ObjCommon/InfoString/InfoString.cpp
View File

@@ -1,6 +1,7 @@
#include "InfoString.h"
#include <cstring>
#include <iostream>
#include <sstream>
#include <stack>
@@ -170,17 +171,36 @@ bool InfoString::FromStream(const std::string& prefix, std::istream& stream)
std::string readPrefix;
if (!infoStream.NextField(readPrefix))
{
std::cerr << "Invalid info string: Empty\n";
return false;
}
if (prefix != readPrefix)
{
std::cerr << "Invalid info string: Prefix \"" << readPrefix << "\" did not match expected prefix \"" << prefix << "\"\n";
return false;
}
std::string key;
while (infoStream.NextField(key))
{
if (key.empty())
{
if (m_keys_by_insertion.empty())
std::cerr << "Invalid info string: Got empty key at the start of the info string\n";
else
std::cerr << "Invalid info string: Got empty key after key \"" << m_keys_by_insertion[m_keys_by_insertion.size() - 1] << "\"\n";
return false;
}
std::string value;
if (!infoStream.NextField(value))
{
std::cerr << "Invalid info string: Unexpected eof, no value for key \"" << key << "\"\n";
return false;
}
const auto existingEntry = m_values.find(key);
if (existingEntry == m_values.end())

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderPhysPreset.cpp
View File

@@ -126,7 +126,7 @@ bool AssetLoaderPhysPreset::LoadFromRaw(
InfoString infoString;
if (!infoString.FromStream(ObjConstants::INFO_STRING_PREFIX_PHYS_PRESET, *file.m_stream))
{
std::cout << "Failed to read phys preset raw file: \"" << fileName << "\"\n";
std::cerr << "Could not parse as info string file: \"" << fileName << "\"\n";
return true;
}

2
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderWeapon.cpp
View File

@@ -440,7 +440,7 @@ bool AssetLoaderWeapon::LoadFromRaw(
InfoString infoString;
if (!infoString.FromStream(ObjConstants::INFO_STRING_PREFIX_WEAPON, *file.m_stream))
{
std::cerr << "Failed to read weapon raw file: \"" << fileName << "\"\n";
std::cerr << "Could not parse as info string file: \"" << fileName << "\"\n";
return true;
}

2
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp
View File

@@ -870,7 +870,7 @@ bool AssetLoaderWeapon::LoadFromRaw(
InfoString infoString;
if (!infoString.FromStream(ObjConstants::INFO_STRING_PREFIX_WEAPON, *file.m_stream))
{
std::cerr << "Failed to read weapon raw file: \"" << fileName << "\"\n";
std::cerr << "Could not parse as info string file: \"" << fileName << "\"\n";
return true;
}

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysConstraints.cpp
View File

@@ -146,7 +146,7 @@ bool AssetLoaderPhysConstraints::LoadFromRaw(
InfoString infoString;
if (!infoString.FromStream(ObjConstants::INFO_STRING_PREFIX_PHYS_CONSTRAINTS, *file.m_stream))
{
std::cout << "Failed to read phys constraints raw file: \"" << fileName << "\"\n";
std::cerr << "Could not parse as info string file: \"" << fileName << "\"\n";
return true;
}

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderPhysPreset.cpp
View File

@@ -129,7 +129,7 @@ bool AssetLoaderPhysPreset::LoadFromRaw(
InfoString infoString;
if (!infoString.FromStream(ObjConstants::INFO_STRING_PREFIX_PHYS_PRESET, *file.m_stream))
{
std::cout << "Failed to read phys preset raw file: \"" << fileName << "\"\n";
std::cerr << "Could not parse as info string file: \"" << fileName << "\"\n";
return true;
}

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderTracer.cpp
View File

@@ -112,7 +112,7 @@ bool AssetLoaderTracer::LoadFromRaw(
InfoString infoString;
if (!infoString.FromStream(ObjConstants::INFO_STRING_PREFIX_TRACER, *file.m_stream))
{
std::cout << "Failed to read tracer raw file: \"" << fileName << "\"\n";
std::cerr << "Could not parse as info string file: \"" << fileName << "\"\n";
return true;
}

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderVehicle.cpp
View File

@@ -175,7 +175,7 @@ bool AssetLoaderVehicle::LoadFromRaw(
InfoString infoString;
if (!infoString.FromStream(ObjConstants::INFO_STRING_PREFIX_VEHICLE, *file.m_stream))
{
std::cout << "Failed to read vehicle raw file: \"" << fileName << "\"\n";
std::cerr << "Could not parse as info string file: \"" << fileName << "\"\n";
return true;
}

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeapon.cpp
View File

@@ -621,7 +621,7 @@ bool AssetLoaderWeapon::LoadFromRaw(
InfoString infoString;
if (!infoString.FromStream(ObjConstants::INFO_STRING_PREFIX_WEAPON, *file.m_stream))
{
std::cerr << "Failed to read weapon raw file: \"" << fileName << "\"\n";
std::cerr << "Could not parse as info string file: \"" << fileName << "\"\n";
return true;
}

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachment.cpp
View File

@@ -165,7 +165,7 @@ bool AssetLoaderWeaponAttachment::LoadFromRaw(
InfoString infoString;
if (!infoString.FromStream(ObjConstants::INFO_STRING_PREFIX_WEAPON_ATTACHMENT, *file.m_stream))
{
std::cerr << "Failed to read attachment raw file: \"" << fileName << "\"\n";
std::cerr << "Could not parse as info string file: \"" << fileName << "\"\n";
return true;
}

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderWeaponAttachmentUnique.cpp
View File

@@ -285,7 +285,7 @@ bool AssetLoaderWeaponAttachmentUnique::LoadFromRaw(
InfoString infoString;
if (!infoString.FromStream(ObjConstants::INFO_STRING_PREFIX_WEAPON_ATTACHMENT_UNIQUE, *file.m_stream))
{
std::cerr << "Failed to read attachment unique raw file: \"" << fileName << "\"\n";
std::cerr << "Could not parse as info string file: \"" << fileName << "\"\n";
return true;
}

2
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderZBarrier.cpp
View File

@@ -126,7 +126,7 @@ bool AssetLoaderZBarrier::LoadFromRaw(
InfoString infoString;
if (!infoString.FromStream(ObjConstants::INFO_STRING_PREFIX_ZBARRIER, *file.m_stream))
{
std::cout << "Failed to read zbarrier raw file: \"" << fileName << "\"\n";
std::cerr << "Could not parse as info string file: \"" << fileName << "\"\n";
return true;
}