ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MemorySettingsInterface: Add {Set,Get}KeyValueList

This commit is contained in:
Connor McLaughlin 2022-12-21 22:38:31 +10:00 committed by lightningterror
parent b1b3f0dbac
commit 509be0b3f8
3 changed files with 95 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
common/HeterogeneousContainers.h
View File

@ -85,6 +85,30 @@ UnorderedStringMapFind(UnorderedStringMap<ValueType>& map, const KeyType& key)
{ {
return map.find(key); return map.find(key);
} }
template <typename KeyType, typename ValueType>
__fi typename UnorderedStringMultimap<ValueType>::const_iterator
UnorderedStringMultiMapFind(const UnorderedStringMultimap<ValueType>& map, const KeyType& key)
{
return map.find(key);
}
template <typename KeyType, typename ValueType>
__fi std::pair<typename UnorderedStringMultimap<ValueType>::const_iterator, typename UnorderedStringMultimap<ValueType>::const_iterator>
UnorderedStringMultiMapEqualRange(const UnorderedStringMultimap<ValueType>& map, const KeyType& key)
{
return map.equal_range(key);
}
template <typename KeyType, typename ValueType>
__fi typename UnorderedStringMultimap<ValueType>::iterator
UnorderedStringMultiMapFind(UnorderedStringMultimap<ValueType>& map, const KeyType& key)
{
return map.find(key);
}
template <typename KeyType, typename ValueType>
__fi std::pair<typename UnorderedStringMultimap<ValueType>::iterator, typename UnorderedStringMultimap<ValueType>::iterator>
UnorderedStringMultiMapEqualRange(UnorderedStringMultimap<ValueType>& map, const KeyType& key)
{
return map.equal_range(key);
}
#else #else
template <typename ValueType> template <typename ValueType>
using UnorderedStringMap = std::unordered_map<std::string, ValueType>; using UnorderedStringMap = std::unordered_map<std::string, ValueType>;
@ -103,6 +127,28 @@ __fi typename UnorderedStringMap<ValueType>::iterator UnorderedStringMapFind(Uno
{ {
return map.find(std::string(key)); return map.find(std::string(key));
} }
template <typename KeyType, typename ValueType>
__fi typename UnorderedStringMultimap<ValueType>::const_iterator UnorderedStringMultiMapFind(const UnorderedStringMultimap<ValueType>& map, const KeyType& key)
{
return map.find(std::string(key));
}
template <typename KeyType, typename ValueType>
__fi std::pair<typename UnorderedStringMultimap<ValueType>::const_iterator, typename UnorderedStringMultimap<ValueType>::const_iterator>
UnorderedStringMultiMapEqualRange(const UnorderedStringMultimap<ValueType>& map, const KeyType& key)
{
return map.equal_range(std::string(key));
}
template <typename KeyType, typename ValueType>
__fi typename UnorderedStringMultimap<ValueType>::iterator UnorderedStringMultiMapFind(UnorderedStringMultimap<ValueType>& map, const KeyType& key)
{
return map.find(std::string(key));
}
template <typename KeyType, typename ValueType>
__fi std::pair<typename UnorderedStringMultimap<ValueType>::iterator, typename UnorderedStringMultimap<ValueType>::iterator>
UnorderedStringMultiMapEqualRange(UnorderedStringMultimap<ValueType>& map, const KeyType& key)
{
return map.equal_range(std::string(key));
}
#endif #endif
template <typename ValueType> template <typename ValueType>

70
common/MemorySettingsInterface.cpp
View File

@ -32,7 +32,7 @@ void MemorySettingsInterface::Clear()
bool MemorySettingsInterface::GetIntValue(const char* section, const char* key, s32* value) const bool MemorySettingsInterface::GetIntValue(const char* section, const char* key, s32* value) const
{ {
const auto sit = m_sections.find(section); const auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
return false; return false;
@ -50,11 +50,11 @@ bool MemorySettingsInterface::GetIntValue(const char* section, const char* key,
bool MemorySettingsInterface::GetUIntValue(const char* section, const char* key, u32* value) const bool MemorySettingsInterface::GetUIntValue(const char* section, const char* key, u32* value) const
{ {
const auto sit = m_sections.find(section); const auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
return false; return false;
const auto iter = sit->second.find(key); const auto iter = UnorderedStringMultiMapFind(sit->second, key);
if (iter == sit->second.end()) if (iter == sit->second.end())
return false; return false;
@ -68,11 +68,11 @@ bool MemorySettingsInterface::GetUIntValue(const char* section, const char* key,
bool MemorySettingsInterface::GetFloatValue(const char* section, const char* key, float* value) const bool MemorySettingsInterface::GetFloatValue(const char* section, const char* key, float* value) const
{ {
const auto sit = m_sections.find(section); const auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
return false; return false;
const auto iter = sit->second.find(key); const auto iter = UnorderedStringMultiMapFind(sit->second, key);
if (iter == sit->second.end()) if (iter == sit->second.end())
return false; return false;
@ -86,11 +86,11 @@ bool MemorySettingsInterface::GetFloatValue(const char* section, const char* key
bool MemorySettingsInterface::GetDoubleValue(const char* section, const char* key, double* value) const bool MemorySettingsInterface::GetDoubleValue(const char* section, const char* key, double* value) const
{ {
const auto sit = m_sections.find(section); const auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
return false; return false;
const auto iter = sit->second.find(key); const auto iter = UnorderedStringMultiMapFind(sit->second, key);
if (iter == sit->second.end()) if (iter == sit->second.end())
return false; return false;
@ -104,11 +104,11 @@ bool MemorySettingsInterface::GetDoubleValue(const char* section, const char* ke
bool MemorySettingsInterface::GetBoolValue(const char* section, const char* key, bool* value) const bool MemorySettingsInterface::GetBoolValue(const char* section, const char* key, bool* value) const
{ {
const auto sit = m_sections.find(section); const auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
return false; return false;
const auto iter = sit->second.find(key); const auto iter = UnorderedStringMultiMapFind(sit->second, key);
if (iter == sit->second.end()) if (iter == sit->second.end())
return false; return false;
@ -122,11 +122,11 @@ bool MemorySettingsInterface::GetBoolValue(const char* section, const char* key,
bool MemorySettingsInterface::GetStringValue(const char* section, const char* key, std::string* value) const bool MemorySettingsInterface::GetStringValue(const char* section, const char* key, std::string* value) const
{ {
const auto sit = m_sections.find(section); const auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
return false; return false;
const auto iter = sit->second.find(key); const auto iter = UnorderedStringMultiMapFind(sit->second, key);
if (iter == sit->second.end()) if (iter == sit->second.end())
return false; return false;
@ -164,13 +164,33 @@ void MemorySettingsInterface::SetStringValue(const char* section, const char* ke
SetValue(section, key, value); SetValue(section, key, value);
} }
std::vector<std::pair<std::string, std::string>> MemorySettingsInterface::GetKeyValueList(const char* section) const
{
std::vector<std::pair<std::string, std::string>> output;
auto sit = UnorderedStringMapFind(m_sections, section);
if (sit != m_sections.end())
{
for (const auto& it : sit->second)
output.emplace_back(it.first, it.second);
}
return output;
}
void MemorySettingsInterface::SetKeyValueList(const char* section, const std::vector<std::pair<std::string, std::string>>& items)
{
auto sit = UnorderedStringMapFind(m_sections, section);
sit->second.clear();
for (const auto& [key, value] : items)
sit->second.emplace(key, value);
}
void MemorySettingsInterface::SetValue(const char* section, const char* key, std::string value) void MemorySettingsInterface::SetValue(const char* section, const char* key, std::string value)
{ {
auto sit = m_sections.find(section); auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
sit = m_sections.emplace(std::make_pair(std::string(section), KeyMap())).first; sit = m_sections.emplace(std::make_pair(std::string(section), KeyMap())).first;
const auto range = sit->second.equal_range(key); const auto range = UnorderedStringMultiMapEqualRange(sit->second, key);
if (range.first == sit->second.end()) if (range.first == sit->second.end())
{ {
sit->second.emplace(std::string(key), std::move(value)); sit->second.emplace(std::string(key), std::move(value));
@ -193,10 +213,10 @@ std::vector<std::string> MemorySettingsInterface::GetStringList(const char* sect
{ {
std::vector<std::string> ret; std::vector<std::string> ret;
const auto sit = m_sections.find(section); const auto sit = UnorderedStringMapFind(m_sections, section);
if (sit != m_sections.end()) if (sit != m_sections.end())
{ {
const auto range = sit->second.equal_range(key); const auto range = UnorderedStringMultiMapEqualRange(sit->second, key);
for (auto iter = range.first; iter != range.second; ++iter) for (auto iter = range.first; iter != range.second; ++iter)
ret.emplace_back(iter->second); ret.emplace_back(iter->second);
} }
@ -206,11 +226,11 @@ std::vector<std::string> MemorySettingsInterface::GetStringList(const char* sect
void MemorySettingsInterface::SetStringList(const char* section, const char* key, const std::vector<std::string>& items) void MemorySettingsInterface::SetStringList(const char* section, const char* key, const std::vector<std::string>& items)
{ {
auto sit = m_sections.find(section); auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
sit = m_sections.emplace(std::make_pair(std::string(section), KeyMap())).first; sit = m_sections.emplace(std::make_pair(std::string(section), KeyMap())).first;
const auto range = sit->second.equal_range(key); const auto range = UnorderedStringMultiMapEqualRange(sit->second, key);
for (auto iter = range.first; iter != range.second;) for (auto iter = range.first; iter != range.second;)
sit->second.erase(iter++); sit->second.erase(iter++);
@ -221,11 +241,11 @@ void MemorySettingsInterface::SetStringList(const char* section, const char* key
bool MemorySettingsInterface::RemoveFromStringList(const char* section, const char* key, const char* item) bool MemorySettingsInterface::RemoveFromStringList(const char* section, const char* key, const char* item)
{ {
auto sit = m_sections.find(section); auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
sit = m_sections.emplace(std::make_pair(std::string(section), KeyMap())).first; sit = m_sections.emplace(std::make_pair(std::string(section), KeyMap())).first;
const auto range = sit->second.equal_range(key); const auto range = UnorderedStringMultiMapEqualRange(sit->second, key);
bool result = false; bool result = false;
for (auto iter = range.first; iter != range.second;) for (auto iter = range.first; iter != range.second;)
{ {
@ -245,11 +265,11 @@ bool MemorySettingsInterface::RemoveFromStringList(const char* section, const ch
bool MemorySettingsInterface::AddToStringList(const char* section, const char* key, const char* item) bool MemorySettingsInterface::AddToStringList(const char* section, const char* key, const char* item)
{ {
auto sit = m_sections.find(section); auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
sit = m_sections.emplace(std::make_pair(std::string(section), KeyMap())).first; sit = m_sections.emplace(std::make_pair(std::string(section), KeyMap())).first;
const auto range = sit->second.equal_range(key); const auto range = UnorderedStringMultiMapEqualRange(sit->second, key);
for (auto iter = range.first; iter != range.second; ++iter) for (auto iter = range.first; iter != range.second; ++iter)
{ {
if (iter->second == item) if (iter->second == item)
@ -262,7 +282,7 @@ bool MemorySettingsInterface::AddToStringList(const char* section, const char* k
bool MemorySettingsInterface::ContainsValue(const char* section, const char* key) const bool MemorySettingsInterface::ContainsValue(const char* section, const char* key) const
{ {
const auto sit = m_sections.find(section); const auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
return false; return false;
@ -271,18 +291,18 @@ bool MemorySettingsInterface::ContainsValue(const char* section, const char* key
void MemorySettingsInterface::DeleteValue(const char* section, const char* key) void MemorySettingsInterface::DeleteValue(const char* section, const char* key)
{ {
auto sit = m_sections.find(section); auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
return; return;
const auto range = sit->second.equal_range(key); const auto range = UnorderedStringMultiMapEqualRange(sit->second, key);
for (auto iter = range.first; iter != range.second;) for (auto iter = range.first; iter != range.second;)
sit->second.erase(iter++); sit->second.erase(iter++);
} }
void MemorySettingsInterface::ClearSection(const char* section) void MemorySettingsInterface::ClearSection(const char* section)
{ {
auto sit = m_sections.find(section); auto sit = UnorderedStringMapFind(m_sections, section);
if (sit == m_sections.end()) if (sit == m_sections.end())
return; return;

4
common/MemorySettingsInterface.h
View File

@ -41,6 +41,10 @@ public:
void SetDoubleValue(const char* section, const char* key, double 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 SetBoolValue(const char* section, const char* key, bool value) override;
void SetStringValue(const char* section, const char* key, const char* value) override; void SetStringValue(const char* section, const char* key, const char* value) override;
std::vector<std::pair<std::string, std::string>> GetKeyValueList(const char* section) const override;
void SetKeyValueList(const char* section, const std::vector<std::pair<std::string, std::string>>& items) override;
bool ContainsValue(const char* section, const char* key) const override; bool ContainsValue(const char* section, const char* key) const override;
void DeleteValue(const char* section, const char* key) override; void DeleteValue(const char* section, const char* key) override;
void ClearSection(const char* section) override; void ClearSection(const char* section) override;