GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Add logging offset for Json parsing errors

Browse Source
This commit is contained in:
Wojtek Figat
2020-12-30 23:50:07 +01:00
parent 29a8abd996
commit 3973452ec3
7 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Engine/Content/BinaryAsset.cpp
View File

@@ -118,16 +118,16 @@ void BinaryAsset::GetImportMetadata(String& path, String& username) const
}
// Parse metadata and try to get import info
rapidjson_flax::Document doc;
doc.Parse((const char*)Metadata.Get(), Metadata.Length());
if (doc.HasParseError() == false)
rapidjson_flax::Document document;
document.Parse((const char*)Metadata.Get(), Metadata.Length());
if (document.HasParseError() == false)
{
path = JsonTools::GetString(doc, "ImportPath");
username = JsonTools::GetString(doc, "ImportUsername");
path = JsonTools::GetString(document, "ImportPath");
username = JsonTools::GetString(document, "ImportUsername");
}
else
{
Log::JsonParseException(doc.GetParseError(), GetPath());
Log::JsonParseException(document.GetParseError(), document.GetErrorOffset(), GetPath());
}
}

2
Source/Engine/Content/JsonAsset.cpp
View File

@@ -128,7 +128,7 @@ Asset::LoadResult JsonAssetBase::loadAsset()
Document.Parse(data.Get<char>(), data.Length());
if (Document.HasParseError())
{
Log::JsonParseException(Document.GetParseError());
Log::JsonParseException(Document.GetParseError(), Document.GetErrorOffset());
return LoadResult::CannotLoadData;
}

4
Source/Engine/Content/Storage/JsonStorageProxy.cpp
View File

@@ -35,7 +35,7 @@ bool JsonStorageProxy::GetAssetInfo(const StringView& path, Guid& resultId, Stri
document.Parse((const char*)fileData.Get(), fileData.Count());
if (document.HasParseError())
{
Log::JsonParseException(document.GetParseError(), String(path));
Log::JsonParseException(document.GetParseError(), document.GetErrorOffset(), String(path));
return false;
}
@@ -104,7 +104,7 @@ bool JsonStorageProxy::ChangeId(const StringView& path, const Guid& newId)
document.Parse((const char*)fileData.Get(), fileData.Count());
if (document.HasParseError())
{
Log::JsonParseException(document.GetParseError(), String(path));
Log::JsonParseException(document.GetParseError(), document.GetErrorOffset(), String(path));
return false;
}