flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Make StatSerializer a namespace

Browse Source
This commit is contained in:
Tiger Wang 2020-08-20 23:27:08 +01:00
parent 8cca3db61b
commit e23dcffaff
3 changed files with 98 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities/Player.cpp
View File

@ -2327,8 +2327,7 @@ bool cPlayer::LoadFromFile(const AString & a_FileName, cWorldPtr & a_World)
{ {
// Load the player stats. // Load the player stats.
// We use the default world name (like bukkit) because stats are shared between dimensions / worlds. // We use the default world name (like bukkit) because stats are shared between dimensions / worlds.
cStatSerializer StatSerializer(m_Stats, cRoot::Get()->GetDefaultWorld()->GetDataPath(), GetUUID().ToLongString()); StatSerializer::Load(m_Stats, cRoot::Get()->GetDefaultWorld()->GetDataPath(), GetUUID().ToLongString());
StatSerializer.Load();
} }
catch (...) catch (...)
{ {
@ -2476,8 +2475,7 @@ bool cPlayer::SaveToDisk()
{ {
// Save the player stats. // Save the player stats.
// We use the default world name (like bukkit) because stats are shared between dimensions / worlds. // We use the default world name (like bukkit) because stats are shared between dimensions / worlds.
cStatSerializer StatSerializer(m_Stats, cRoot::Get()->GetDefaultWorld()->GetDataPath(), GetUUID().ToLongString()); StatSerializer::Save(m_Stats, cRoot::Get()->GetDefaultWorld()->GetDataPath(), GetUUID().ToLongString());
StatSerializer.Save();
} }
catch (...) catch (...)
{ {

180
src/WorldStorage/StatSerializer.cpp
View File

@ -104,114 +104,118 @@ static const std::unordered_map<std::string_view, Statistic> LegacyMapping
cStatSerializer::cStatSerializer(cStatManager & Manager, const std::string & WorldPath, std::string FileName) : namespace StatSerializer
m_Manager(Manager),
m_Path(WorldPath + cFile::GetPathSeparator() + "stats")
{ {
// Even though stats are shared between worlds, they are (usually) saved auto MakeStatisticsDirectory(const std::string & WorldPath, std::string FileName)
// inside the folder of the default world.
// Ensure that the directory exists.
cFile::CreateFolder(m_Path);
m_Path += cFile::GetPathSeparator() + std::move(FileName) + ".json";
}
void cStatSerializer::Load(void)
{
Json::Value Root;
InputFileStream(m_Path) >> Root;
LoadLegacyFromJSON(Root);
LoadCustomStatFromJSON(Root["stats"]["custom"]);
}
void cStatSerializer::Save(void)
{
Json::Value Root;
SaveStatToJSON(Root["stats"]);
Root["DataVersion"] = NamespaceSerializer::DataVersion();
OutputFileStream(m_Path) << Root;
}
void cStatSerializer::SaveStatToJSON(Json::Value & a_Out)
{
m_Manager.ForEachStatisticType([&a_Out](const cStatManager::CustomStore & Store)
{ {
if (Store.empty()) // Even though stats are shared between worlds, they are (usually) saved
{ // inside the folder of the default world.
// Avoid saving "custom": null to disk:
return;
}
auto & Custom = a_Out["custom"]; // Path to the world's statistics folder.
for (const auto & Item : Store) const auto Path = WorldPath + cFile::GetPathSeparator() + "stats";
{
Custom[NamespaceSerializer::From(Item.first)] = Item.second; // Ensure that the directory exists.
} cFile::CreateFolder(Path);
});
} return Path + cFile::GetPathSeparator() + std::move(FileName) + ".json";
}
void cStatSerializer::LoadLegacyFromJSON(const Json::Value & In) void SaveStatToJSON(const cStatManager & Manager, Json::Value & a_Out)
{
for (auto Entry = In.begin(); Entry != In.end(); ++Entry)
{ {
const auto & Key = Entry.key().asString(); Manager.ForEachStatisticType([&a_Out](const cStatManager::CustomStore & Store)
const auto FindResult = LegacyMapping.find(Key);
if ((FindResult != LegacyMapping.end()) && Entry->isInt())
{ {
m_Manager.SetValue(FindResult->second, Entry->asInt()); if (Store.empty())
{
// Avoid saving "custom": null to disk:
return;
}
auto & Custom = a_Out["custom"];
for (const auto & Item : Store)
{
Custom[NamespaceSerializer::From(Item.first)] = Item.second;
}
});
}
void LoadLegacyFromJSON(cStatManager & Manager, const Json::Value & In)
{
for (auto Entry = In.begin(); Entry != In.end(); ++Entry)
{
const auto & Key = Entry.key().asString();
const auto FindResult = LegacyMapping.find(Key);
if ((FindResult != LegacyMapping.end()) && Entry->isInt())
{
Manager.SetValue(FindResult->second, Entry->asInt());
}
} }
} }
}
void cStatSerializer::LoadCustomStatFromJSON(const Json::Value & a_In) void LoadCustomStatFromJSON(cStatManager & Manager, const Json::Value & a_In)
{
for (auto it = a_In.begin() ; it != a_In.end() ; ++it)
{ {
const auto & Key = it.key().asString(); for (auto it = a_In.begin(); it != a_In.end(); ++it)
const auto StatInfo = NamespaceSerializer::SplitNamespacedID(Key);
if (StatInfo.first == NamespaceSerializer::Namespace::Unknown)
{ {
// Ignore non-Vanilla, non-Cuberite namespaces for now: const auto & Key = it.key().asString();
continue; const auto StatInfo = NamespaceSerializer::SplitNamespacedID(Key);
} if (StatInfo.first == NamespaceSerializer::Namespace::Unknown)
{
// Ignore non-Vanilla, non-Cuberite namespaces for now:
continue;
}
const auto & StatName = StatInfo.second; const auto & StatName = StatInfo.second;
try try
{ {
m_Manager.SetValue(NamespaceSerializer::ToCustomStatistic(StatName), it->asInt()); Manager.SetValue(NamespaceSerializer::ToCustomStatistic(StatName), it->asInt());
} }
catch (const std::out_of_range & Oops) catch (const std::out_of_range & Oops)
{ {
FLOGWARNING("Invalid statistic type \"{}\"", StatName); FLOGWARNING("Invalid statistic type \"{}\"", StatName);
} }
catch (const Json::LogicError & Oops) catch (const Json::LogicError & Oops)
{ {
FLOGWARNING("Invalid statistic value for type \"{}\"", StatName); FLOGWARNING("Invalid statistic value for type \"{}\"", StatName);
}
} }
} }
void Load(cStatManager & Manager, const std::string & WorldPath, std::string FileName)
{
Json::Value Root;
InputFileStream(MakeStatisticsDirectory(WorldPath, FileName)) >> Root;
LoadLegacyFromJSON(Manager, Root);
LoadCustomStatFromJSON(Manager, Root["stats"]["custom"]);
}
void Save(const cStatManager & Manager, const std::string & WorldPath, std::string FileName)
{
Json::Value Root;
SaveStatToJSON(Manager, Root["stats"]);
Root["DataVersion"] = NamespaceSerializer::DataVersion();
OutputFileStream(MakeStatisticsDirectory(WorldPath, FileName)) << Root;
}
} }

24
src/WorldStorage/StatSerializer.h
View File

@ -21,27 +21,11 @@ namespace Json { class Value; }
class cStatSerializer namespace StatSerializer
{ {
public:
cStatSerializer(cStatManager & Manager, const std::string & WorldPath, std::string FileName);
/* Try to load the player statistics. */ /* Try to load the player statistics. */
void Load(void); void Load(cStatManager & Manager, const std::string & WorldPath, std::string FileName);
/* Try to save the player statistics. */ /* Try to save the player statistics. */
void Save(void); void Save(const cStatManager & Manager, const std::string & WorldPath, std::string FileName);
}
private:
void SaveStatToJSON(Json::Value & a_Out);
void LoadLegacyFromJSON(const Json::Value & In);
void LoadCustomStatFromJSON(const Json::Value & a_In);
cStatManager & m_Manager;
std::string m_Path;
} ;