Backport SettingsInterface

This commit is contained in:
Connor McLaughlin
2022-07-09 00:14:48 +10:00
parent 0c0bd4c995
commit 6a6ab6529a
13 changed files with 749 additions and 113 deletions

View File

@ -23,90 +23,129 @@ static std::string GetFullKey(const char* section, const char* key)
return StringUtil::StdStringFromFormat("%s/%s", section, key);
}
int RegTestSettingsInterface::GetIntValue(const char* section, const char* key, int default_value /*= 0*/)
bool RegTestSettingsInterface::GetIntValue(const char* section, const char* key, s32* value) const
{
int retval = default_value;
const std::string fullkey(GetFullKey(section, key));
auto iter = m_keys.find(fullkey);
if (iter != m_keys.end())
retval = StringUtil::FromChars<int>(iter->second, 10).value_or(default_value);
if (iter == m_keys.end())
return false;
Log_DevPrintf("GetIntValue(%s) -> %d", fullkey.c_str(), retval);
return retval;
std::optional<s32> parsed = StringUtil::FromChars<s32>(iter->second, 10);
if (!parsed.has_value())
return false;
*value = parsed.value();
return true;
}
float RegTestSettingsInterface::GetFloatValue(const char* section, const char* key, float default_value /*= 0.0f*/)
bool RegTestSettingsInterface::GetUIntValue(const char* section, const char* key, u32* value) const
{
float retval = default_value;
const std::string fullkey(GetFullKey(section, key));
auto iter = m_keys.find(fullkey);
if (iter != m_keys.end())
retval = StringUtil::FromChars<float>(iter->second).value_or(default_value);
if (iter == m_keys.end())
return false;
Log_DevPrintf("GetFloatValue(%s) -> %f", fullkey.c_str(), retval);
return retval;
std::optional<u32> parsed = StringUtil::FromChars<u32>(iter->second, 10);
if (!parsed.has_value())
return false;
*value = parsed.value();
return true;
}
bool RegTestSettingsInterface::GetBoolValue(const char* section, const char* key, bool default_value /*= false*/)
bool RegTestSettingsInterface::GetFloatValue(const char* section, const char* key, float* value) const
{
bool retval = default_value;
const std::string fullkey(GetFullKey(section, key));
auto iter = m_keys.find(fullkey);
if (iter != m_keys.end())
retval = StringUtil::FromChars<bool>(iter->second).value_or(default_value);
if (iter == m_keys.end())
return false;
Log_DevPrintf("GetBoolValue(%s) -> %s", fullkey.c_str(), retval ? "true" : "false");
return retval;
std::optional<float> parsed = StringUtil::FromChars<float>(iter->second);
if (!parsed.has_value())
return false;
*value = parsed.value();
return true;
}
std::string RegTestSettingsInterface::GetStringValue(const char* section, const char* key,
const char* default_value /*= ""*/)
bool RegTestSettingsInterface::GetDoubleValue(const char* section, const char* key, double* value) const
{
std::string retval;
const std::string fullkey(GetFullKey(section, key));
auto iter = m_keys.find(fullkey);
if (iter != m_keys.end())
retval = iter->second;
else
retval = default_value;
if (iter == m_keys.end())
return false;
Log_DevPrintf("GetStringValue(%s) -> %s", fullkey.c_str(), retval.c_str());
return retval;
std::optional<double> parsed = StringUtil::FromChars<double>(iter->second);
if (!parsed.has_value())
return false;
*value = parsed.value();
return true;
}
void RegTestSettingsInterface::SetIntValue(const char* section, const char* key, int value)
bool RegTestSettingsInterface::GetBoolValue(const char* section, const char* key, bool* value) const
{
const std::string fullkey(GetFullKey(section, key));
auto iter = m_keys.find(fullkey);
if (iter == m_keys.end())
return false;
std::optional<bool> parsed = StringUtil::FromChars<bool>(iter->second);
if (!parsed.has_value())
return false;
*value = parsed.value();
return true;
}
bool RegTestSettingsInterface::GetStringValue(const char* section, const char* key, std::string* value) const
{
const std::string fullkey(GetFullKey(section, key));
auto iter = m_keys.find(fullkey);
if (iter == m_keys.end())
return false;
*value = iter->second;
return true;
}
void RegTestSettingsInterface::SetIntValue(const char* section, const char* key, s32 value)
{
const std::string fullkey(GetFullKey(section, key));
m_keys[std::move(fullkey)] = std::to_string(value);
}
void RegTestSettingsInterface::SetUIntValue(const char* section, const char* key, u32 value)
{
const std::string fullkey(GetFullKey(section, key));
Log_DevPrintf("SetIntValue(%s, %d)", fullkey.c_str(), value);
m_keys[std::move(fullkey)] = std::to_string(value);
}
void RegTestSettingsInterface::SetFloatValue(const char* section, const char* key, float value)
{
const std::string fullkey(GetFullKey(section, key));
Log_DevPrintf("SetFloatValue(%s, %f)", fullkey.c_str(), value);
m_keys[std::move(fullkey)] = std::to_string(value);
}
void RegTestSettingsInterface::SetDoubleValue(const char* section, const char* key, double value)
{
const std::string fullkey(GetFullKey(section, key));
m_keys[std::move(fullkey)] = std::to_string(value);
}
void RegTestSettingsInterface::SetBoolValue(const char* section, const char* key, bool value)
{
const std::string fullkey(GetFullKey(section, key));
Log_DevPrintf("SetBoolValue(%s, %s)", fullkey.c_str(), value ? "true" : "false");
m_keys[std::move(fullkey)] = std::string(value ? "true" : "false");
}
void RegTestSettingsInterface::SetStringValue(const char* section, const char* key, const char* value)
{
const std::string fullkey(GetFullKey(section, key));
Log_DevPrintf("SetStringValue(%s, %s)", fullkey.c_str(), value);
m_keys[std::move(fullkey)] = value;
}
std::vector<std::string> RegTestSettingsInterface::GetStringList(const char* section, const char* key)
std::vector<std::string> RegTestSettingsInterface::GetStringList(const char* section, const char* key) const
{
std::vector<std::string> ret;
Panic("Not implemented");
@ -131,10 +170,15 @@ bool RegTestSettingsInterface::AddToStringList(const char* section, const char*
return false;
}
bool RegTestSettingsInterface::ContainsValue(const char* section, const char* key) const
{
const std::string fullkey(GetFullKey(section, key));
return (m_keys.find(fullkey) != m_keys.end());
}
void RegTestSettingsInterface::DeleteValue(const char* section, const char* key)
{
const std::string fullkey(GetFullKey(section, key));
Log_DevPrintf("DeleteValue(%s)", fullkey.c_str());
auto iter = m_keys.find(fullkey);
if (iter != m_keys.end())
@ -143,8 +187,6 @@ void RegTestSettingsInterface::DeleteValue(const char* section, const char* key)
void RegTestSettingsInterface::ClearSection(const char* section)
{
Log_DevPrintf("ClearSection(%s)", section);
const std::string start(StringUtil::StdStringFromFormat("%s/", section));
for (auto iter = m_keys.begin(); iter != m_keys.end();)
{

View File

@ -10,25 +10,38 @@ public:
~RegTestSettingsInterface();
bool Save() override;
void Clear() override;
int GetIntValue(const char* section, const char* key, int default_value = 0) override;
float GetFloatValue(const char* section, const char* key, float default_value = 0.0f) override;
bool GetBoolValue(const char* section, const char* key, bool default_value = false) override;
bool GetIntValue(const char* section, const char* key, s32* value) const override;
bool GetUIntValue(const char* section, const char* key, u32* value) const override;
bool GetFloatValue(const char* section, const char* key, float* value) const override;
bool GetDoubleValue(const char* section, const char* key, double* value) const override;
bool GetBoolValue(const char* section, const char* key, bool* value) const override;
bool GetStringValue(const char* section, const char* key, std::string* value) const override;
std::string GetStringValue(const char* section, const char* key, const char* default_value = "") override;
void SetIntValue(const char* section, const char* key, int value) override;
void SetIntValue(const char* section, const char* key, s32 value) override;
void SetUIntValue(const char* section, const char* key, u32 value) override;
void SetFloatValue(const char* section, const char* key, float value) override;
void SetDoubleValue(const char* section, const char* key, double value) override;
void SetBoolValue(const char* section, const char* key, bool value) override;
void SetStringValue(const char* section, const char* key, const char* value) override;
bool ContainsValue(const char* section, const char* key) const override;
void DeleteValue(const char* section, const char* key) override;
void ClearSection(const char* section) override;
std::vector<std::string> GetStringList(const char* section, const char* key) override;
std::vector<std::string> GetStringList(const char* section, const char* key) const override;
void SetStringList(const char* section, const char* key, const std::vector<std::string>& items) override;
bool RemoveFromStringList(const char* section, const char* key, const char* item) override;
bool AddToStringList(const char* section, const char* key, const char* item) override;
void DeleteValue(const char* section, const char* key) override;
void ClearSection(const char* section) override;
// default parameter overloads
using SettingsInterface::GetBoolValue;
using SettingsInterface::GetDoubleValue;
using SettingsInterface::GetFloatValue;
using SettingsInterface::GetIntValue;
using SettingsInterface::GetStringValue;
using SettingsInterface::GetUIntValue;
private:
using KeyMap = std::unordered_map<std::string, std::string>;