From e23dcffaff5ce3b3da1e44fba21c03e66f48c1ce Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Thu, 20 Aug 2020 23:27:08 +0100 Subject: Make StatSerializer a namespace --- src/Entities/Player.cpp | 6 +- src/WorldStorage/StatSerializer.cpp | 146 ++++++++++++++++++------------------ src/WorldStorage/StatSerializer.h | 24 +----- 3 files changed, 81 insertions(+), 95 deletions(-) (limited to 'src') diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 764bd7500..841b70b01 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -2327,8 +2327,7 @@ bool cPlayer::LoadFromFile(const AString & a_FileName, cWorldPtr & a_World) { // Load the player stats. // 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(); + StatSerializer::Load(m_Stats, cRoot::Get()->GetDefaultWorld()->GetDataPath(), GetUUID().ToLongString()); } catch (...) { @@ -2476,8 +2475,7 @@ bool cPlayer::SaveToDisk() { // Save the player stats. // 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(); + StatSerializer::Save(m_Stats, cRoot::Get()->GetDefaultWorld()->GetDataPath(), GetUUID().ToLongString()); } catch (...) { diff --git a/src/WorldStorage/StatSerializer.cpp b/src/WorldStorage/StatSerializer.cpp index 50767ae94..eff80149e 100644 --- a/src/WorldStorage/StatSerializer.cpp +++ b/src/WorldStorage/StatSerializer.cpp @@ -104,114 +104,118 @@ static const std::unordered_map LegacyMapping -cStatSerializer::cStatSerializer(cStatManager & Manager, const std::string & WorldPath, std::string FileName) : - m_Manager(Manager), - m_Path(WorldPath + cFile::GetPathSeparator() + "stats") +namespace StatSerializer { - // Even though stats are shared between worlds, they are (usually) saved - // inside the folder of the default world. + auto MakeStatisticsDirectory(const std::string & WorldPath, std::string FileName) + { + // Even though stats are shared between worlds, they are (usually) saved + // inside the folder of the default world. - // Ensure that the directory exists. - cFile::CreateFolder(m_Path); + // Path to the world's statistics folder. + const auto Path = WorldPath + cFile::GetPathSeparator() + "stats"; - m_Path += cFile::GetPathSeparator() + std::move(FileName) + ".json"; -} + // Ensure that the directory exists. + cFile::CreateFolder(Path); + return 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 SaveStatToJSON(const cStatManager & Manager, Json::Value & a_Out) + { + Manager.ForEachStatisticType([&a_Out](const cStatManager::CustomStore & Store) + { + 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 cStatSerializer::Save(void) -{ - Json::Value Root; - SaveStatToJSON(Root["stats"]); - Root["DataVersion"] = NamespaceSerializer::DataVersion(); + 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); - OutputFileStream(m_Path) << Root; -} + if ((FindResult != LegacyMapping.end()) && Entry->isInt()) + { + Manager.SetValue(FindResult->second, Entry->asInt()); + } + } + } -void cStatSerializer::SaveStatToJSON(Json::Value & a_Out) -{ - m_Manager.ForEachStatisticType([&a_Out](const cStatManager::CustomStore & Store) + void LoadCustomStatFromJSON(cStatManager & Manager, const Json::Value & a_In) { - if (Store.empty()) + for (auto it = a_In.begin(); it != a_In.end(); ++it) { - // Avoid saving "custom": null to disk: - return; + const auto & Key = it.key().asString(); + 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; + try + { + Manager.SetValue(NamespaceSerializer::ToCustomStatistic(StatName), it->asInt()); + } + catch (const std::out_of_range & Oops) + { + FLOGWARNING("Invalid statistic type \"{}\"", StatName); + } + catch (const Json::LogicError & Oops) + { + FLOGWARNING("Invalid statistic value for type \"{}\"", StatName); + } } - - auto & Custom = a_Out["custom"]; - for (const auto & Item : Store) - { - Custom[NamespaceSerializer::From(Item.first)] = Item.second; - } - }); -} + } -void cStatSerializer::LoadLegacyFromJSON(const Json::Value & In) -{ - for (auto Entry = In.begin(); Entry != In.end(); ++Entry) + void Load(cStatManager & Manager, const std::string & WorldPath, std::string FileName) { - const auto & Key = Entry.key().asString(); - const auto FindResult = LegacyMapping.find(Key); + Json::Value Root; + InputFileStream(MakeStatisticsDirectory(WorldPath, FileName)) >> Root; - if ((FindResult != LegacyMapping.end()) && Entry->isInt()) - { - m_Manager.SetValue(FindResult->second, Entry->asInt()); - } + LoadLegacyFromJSON(Manager, Root); + LoadCustomStatFromJSON(Manager, Root["stats"]["custom"]); } -} -void cStatSerializer::LoadCustomStatFromJSON(const Json::Value & a_In) -{ - for (auto it = a_In.begin() ; it != a_In.end() ; ++it) + void Save(const cStatManager & Manager, const std::string & WorldPath, std::string FileName) { - const auto & Key = it.key().asString(); - const auto StatInfo = NamespaceSerializer::SplitNamespacedID(Key); - if (StatInfo.first == NamespaceSerializer::Namespace::Unknown) - { - // Ignore non-Vanilla, non-Cuberite namespaces for now: - continue; - } + Json::Value Root; - const auto & StatName = StatInfo.second; - try - { - m_Manager.SetValue(NamespaceSerializer::ToCustomStatistic(StatName), it->asInt()); - } - catch (const std::out_of_range & Oops) - { - FLOGWARNING("Invalid statistic type \"{}\"", StatName); - } - catch (const Json::LogicError & Oops) - { - FLOGWARNING("Invalid statistic value for type \"{}\"", StatName); - } + SaveStatToJSON(Manager, Root["stats"]); + Root["DataVersion"] = NamespaceSerializer::DataVersion(); + + OutputFileStream(MakeStatisticsDirectory(WorldPath, FileName)) << Root; } } diff --git a/src/WorldStorage/StatSerializer.h b/src/WorldStorage/StatSerializer.h index efbdbe4e5..59b502425 100644 --- a/src/WorldStorage/StatSerializer.h +++ b/src/WorldStorage/StatSerializer.h @@ -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. */ - void Load(void); + void Load(cStatManager & Manager, const std::string & WorldPath, std::string FileName); /* Try to save the player statistics. */ - void Save(void); - -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; -} ; + void Save(const cStatManager & Manager, const std::string & WorldPath, std::string FileName); +} -- cgit v1.2.3