piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4991 from leoetlino/config-loaders

Browse Source 
New config loaders
This commit is contained in:
Anthony
2017-03-09 16:56:14 +00:00
committed by GitHub
parent d847a4030b 9373c7eca9
commit dc42f7fb28
16 changed files with 902 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Source/Core/Common/IniFile.cpp
View File

@ -256,6 +256,37 @@ bool IniFile::Section::Delete(const std::string& key)
return true;
}
void IniFile::Section::SetLines(const std::vector<std::string>& lines)
{
m_lines = lines;
}
bool IniFile::Section::GetLines(std::vector<std::string>* lines, const bool remove_comments) const
{
for (std::string line : m_lines)
{
line = StripSpaces(line);
if (remove_comments)
{
size_t commentPos = line.find('#');
if (commentPos == 0)
{
continue;
}
if (commentPos != std::string::npos)
{
line = StripSpaces(line.substr(0, commentPos));
}
}
lines->push_back(line);
}
return true;
}
// IniFile
const IniFile::Section* IniFile::GetSection(const std::string& sectionName) const
@ -312,7 +343,7 @@ bool IniFile::Exists(const std::string& sectionName, const std::string& key) con
void IniFile::SetLines(const std::string& sectionName, const std::vector<std::string>& lines)
{
Section* section = GetOrCreateSection(sectionName);
section->lines = lines;
section->SetLines(lines);
}
bool IniFile::DeleteKey(const std::string& sectionName, const std::string& key)
@ -345,28 +376,7 @@ bool IniFile::GetLines(const std::string& sectionName, std::vector<std::string>*
if (!section)
return false;
for (std::string line : section->lines)
{
line = StripSpaces(line);
if (remove_comments)
{
size_t commentPos = line.find('#');
if (commentPos == 0)
{
continue;
}
if (commentPos != std::string::npos)
{
line = StripSpaces(line.substr(0, commentPos));
}
}
lines->push_back(line);
}
return true;
return section->GetLines(lines, remove_comments);
}
void IniFile::SortSections()
@ -439,7 +449,7 @@ bool IniFile::Load(const std::string& filename, bool keep_current_data)
// INI is a hack anyway.
if ((key == "" && value == "") ||
(line.size() >= 1 && (line[0] == '$' || line[0] == '+' || line[0] == '*')))
current_section->lines.push_back(line);
current_section->m_lines.push_back(line);
else
current_section->Set(key, value);
}
@ -464,12 +474,12 @@ bool IniFile::Save(const std::string& filename)
for (const Section& section : sections)
{
if (section.keys_order.size() != 0 || section.lines.size() != 0)
if (section.keys_order.size() != 0 || section.m_lines.size() != 0)
out << "[" << section.name << "]" << std::endl;
if (section.keys_order.size() == 0)
{
for (const std::string& s : section.lines)
for (const std::string& s : section.m_lines)
out << s << std::endl;
}
else

6
Source/Core/Common/IniFile.h
View File

@ -66,18 +66,22 @@ public:
bool Get(const std::string& key, double* value, double defaultValue = 0.0) const;
bool Get(const std::string& key, std::vector<std::string>* values) const;
void SetLines(const std::vector<std::string>& lines);
bool GetLines(std::vector<std::string>* lines, const bool remove_comments = true) const;
bool operator<(const Section& other) const { return name < other.name; }
using SectionMap = std::map<std::string, std::string, CaseInsensitiveStringCompare>;
const std::string& GetName() const { return name; }
const SectionMap& GetValues() const { return values; }
bool HasLines() const { return !m_lines.empty(); }
protected:
std::string name;
std::vector<std::string> keys_order;
SectionMap values;
std::vector<std::string> lines;
std::vector<std::string> m_lines;
};
/**

1
Source/Core/Common/Logging/Log.h
View File

@ -15,6 +15,7 @@ enum LOG_TYPE
COMMANDPROCESSOR,
COMMON,
CONSOLE,
CORE,
DISCIO,
DSPHLE,
DSPLLE,

1
Source/Core/Common/Logging/LogManager.cpp
View File

@ -49,6 +49,7 @@ LogManager::LogManager()
m_Log[LogTypes::COMMANDPROCESSOR] = new LogContainer("CP", "CommandProc");
m_Log[LogTypes::COMMON] = new LogContainer("COMMON", "Common");
m_Log[LogTypes::CONSOLE] = new LogContainer("CONSOLE", "Dolphin Console");
m_Log[LogTypes::CORE] = new LogContainer("CORE", "Core");
m_Log[LogTypes::DISCIO] = new LogContainer("DIO", "Disc IO");
m_Log[LogTypes::DSPHLE] = new LogContainer("DSPHLE", "DSP HLE");
m_Log[LogTypes::DSPLLE] = new LogContainer("DSPLLE", "DSP LLE");