yyc12345/YYCCommonplace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix issue in config manager.

Browse Source 
- fix fwrite fread issue in config manager.
- add testbench for config manager.
- change testbench order to get better experience.
This commit is contained in:
yyc12345
2024-07-03 10:14:17 +08:00
parent e2a582e7d2
commit e374575852
3 changed files with 116 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ConfigManager.cpp
View File

@ -35,7 +35,7 @@ namespace YYCC::ConfigManager {
// fetch version info
uint64_t version_info;
if (std::fread(&version_info, sizeof(version_info), 1u, fs.get()) != sizeof(version_info))
if (std::fread(&version_info, 1u, sizeof(version_info), fs.get()) != sizeof(version_info))
return false;
// check version
// if read version is greater than we expected,
@ -51,19 +51,19 @@ namespace YYCC::ConfigManager {
// try fetch setting name
// fetch name length
size_t name_length;
if (std::fread(&name_length, sizeof(name_length), 1u, fs.get()) != sizeof(name_length)) {
if (std::fread(&name_length, 1u, sizeof(name_length), fs.get()) != sizeof(name_length)) {
// we also check whether reach EOF at there.
if (std::feof(fs.get())) break;
else return false;
}
// fetch name body
name_cache.resize(name_length);
if (std::fread(name_cache.data(), name_length, 1u, fs.get()) != name_length)
if (std::fread(name_cache.data(), 1u, name_length, fs.get()) != name_length)
return false;
// get setting data length
size_t data_length;
if (std::fread(&data_length, sizeof(data_length), 1u, fs.get()) != sizeof(data_length))
if (std::fread(&data_length, 1u, sizeof(data_length), fs.get()) != sizeof(data_length))
return false;
// get matched setting first
@ -71,7 +71,7 @@ namespace YYCC::ConfigManager {
if (found != m_Settings.end()) {
// found. read data for it
found->second->ResizeData(data_length);
if (std::fread(found->second->GetDataPtr(), data_length, 1u, fs.get()) != data_length)
if (std::fread(found->second->GetDataPtr(), 1u, data_length, fs.get()) != data_length)
return false;
// call user defined load function
// if fail to parse, reset to default value
@ -95,7 +95,7 @@ namespace YYCC::ConfigManager {
// write config data
uint64_t version_info = m_VersionIdentifier;
if (std::fwrite(&version_info, sizeof(version_info), 1u, fs.get()) != sizeof(version_info))
if (std::fwrite(&version_info, 1u, sizeof(version_info), fs.get()) != sizeof(version_info))
return false;
// iterate all data for writing
@ -108,19 +108,19 @@ namespace YYCC::ConfigManager {
// write setting name
// write name length
size_t name_length = pair.first.size();
if (std::fwrite(&name_length, sizeof(name_length), 1u, fs.get()) != sizeof(name_length))
if (std::fwrite(&name_length, 1u, sizeof(name_length), fs.get()) != sizeof(name_length))
return false;
// write name body
if (std::fwrite(pair.first.c_str(), name_length, 1u, fs.get()) != name_length)
if (std::fwrite(pair.first.c_str(), 1u, name_length, fs.get()) != name_length)
return false;
// write setting daat
// write data length
size_t data_length = pair.second->GetDataSize();
if (std::fwrite(&data_length, sizeof(data_length), 1u, fs.get()) != sizeof(data_length))
if (std::fwrite(&data_length, 1u, sizeof(data_length), fs.get()) != sizeof(data_length))
return false;
// write data body
if (std::fwrite(pair.second->GetDataPtr(), data_length, 1u, fs.get()) != data_length)
if (std::fwrite(pair.second->GetDataPtr(), 1u, data_length, fs.get()) != data_length)
return false;
}

9
src/ConfigManager.hpp
View File

@ -26,7 +26,7 @@ namespace YYCC::ConfigManager {
namespace ConstrainPresets {
template<typename _Ty, std::enable_if_t<std::is_arithmetic_v<_Ty>, int> = 0>
template<typename _Ty, std::enable_if_t<std::is_arithmetic_v<_Ty> && !std::is_enum_v<_Ty> && !std::is_same_v<_Ty, bool>, int> = 0>
Constrain<_Ty> GetNumberRangeConstrain(_Ty min_value, _Ty max_value) {
if (min_value > max_value)
throw std::invalid_argument("invalid min max value for NumberRangeConstrain");
@ -93,7 +93,7 @@ namespace YYCC::ConfigManager {
#pragma region Setting Presets
template<typename _Ty, std::enable_if_t<std::is_arithmetic_v<_Ty>, int> = 0>
template<typename _Ty, std::enable_if_t<std::is_arithmetic_v<_Ty> || std::is_enum_v<_Ty>, int> = 0>
class NumberSetting : public AbstractSetting {
public:
NumberSetting(const yycc_char8_t* name, _Ty default_value, Constrain<_Ty> constrain = Constrain<_Ty> {}) :
@ -103,7 +103,7 @@ namespace YYCC::ConfigManager {
_Ty Get() const { return m_Data; }
bool Set(_Ty new_data) {
// validate data
if (m_Constrain.IsValid() && !m_Constrain.m_CheckFct(m_Data))
if (m_Constrain.IsValid() && !m_Constrain.m_CheckFct(new_data))
return false;
// assign data
m_Data = new_data;
@ -189,6 +189,9 @@ namespace YYCC::ConfigManager {
std::memcpy(ptr + sizeof(string_length), m_Data.data(), string_length);
return true;
}
virtual void UserReset() override {
m_Data = m_DefaultData;
}
yycc_u8string m_Data, m_DefaultData;
Constrain<yycc_u8string> m_Constrain;