ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep a list of section config values that are not key/value pairs:

Browse Source 
This change to BasicConfig stores all appended lines which are not key/value
pairs in a separate values vector which can be retrieved later. This is to
support sections containing both key/value pairs and a list of values.
This commit is contained in:
Vinnie Falco
2014-10-09 18:39:58 -07:00
parent dfeb9967b8
commit db5d52b4b2
2 changed files with 91 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
src/ripple/basics/BasicConfig.h
View File

@@ -40,6 +40,7 @@ class Section
{
private:
std::vector <std::string> lines_;
std::vector <std::string> values_;
std::map <std::string, std::string, beast::ci_less> map_;
public:
@@ -53,31 +54,45 @@ public:
return map_.size();
}
/** Returns all the lines in the section. */
/** Returns all the lines in the section.
This includes everything.
*/
std::vector <std::string> const&
lines() const
{
return lines_;
}
/** Returns all the values in the section.
Values are non-empty lines which are not key/value pairs.
*/
std::vector <std::string> const&
values() const
{
return values_;
}
/** Set a key/value pair.
The previous value is discarded.
*/
void
set (std::string const& key, std::string const& value);
/** Append a line to this section.
If the line can be parsed as a key/value pair it is added to the map.
*/
void
append (std::string const& line);
/** Append a set of lines to this section.
Parsable key/value pairs are also added to the map.
Lines containing key/value pairs are added to the map,
else they are added to the values list. Everything is
added to the lines list.
*/
void
append (std::vector <std::string> const& lines);
/** Append a line to this section. */
void
append (std::string const& line)
{
append (std::vector<std::string>{ line });
}
/** Returns `true` if a key with the given name exists. */
bool
exists (std::string const& name) const;
@@ -93,6 +108,64 @@ public:
operator<< (std::ostream&, Section const& section);
};
//------------------------------------------------------------------------------
/** Holds unparsed configuration information.
The raw data sections are processed with intermediate parsers specific
to each module instead of being all parsed in a central location.
*/
class BasicConfig
{
private:
std::map <std::string, Section, beast::ci_less> map_;
public:
/** Returns `true` if a section with the given name exists. */
bool
exists (std::string const& name) const;
/** Returns the section with the given name.
If the section does not exist, an empty section is returned.
*/
/** @{ */
Section const&
section (std::string const& name) const;
Section const&
operator[] (std::string const& name) const
{
return section(name);
}
/** @} */
/** Overwrite a key/value pair with a command line argument
If the section does not exist it is created.
The previous value, if any, is overwritten.
*/
void
overwrite (std::string const& section, std::string const& key,
std::string const& value);
friend
std::ostream&
operator<< (std::ostream& ss, BasicConfig const& c);
protected:
void
build (IniFileSections const& ifs);
/** Insert a legacy single section as a key/value pair.
Does nothing if the section does not exist, or does not contain
a single line that is not a key/value pair.
@deprecated
*/
void
remap (std::string const& legacy_section,
std::string const& key, std::string const& new_section);
};
//------------------------------------------------------------------------------
/** Set a value from a configuration Section
If the named value is not found, the variable is unchanged.
@return `true` if value was set.
@@ -163,62 +236,6 @@ get (Section const& section,
return defaultValue;
}
//------------------------------------------------------------------------------
/** Holds unparsed configuration information.
The raw data sections are processed with intermediate parsers specific
to each module instead of being all parsed in a central location.
*/
class BasicConfig
{
private:
std::map <std::string, Section, beast::ci_less> map_;
public:
/** Returns `true` if a section with the given name exists. */
bool
exists (std::string const& name) const;
/** Returns the section with the given name.
If the section does not exist, an empty section is returned.
*/
/** @{ */
Section const&
section (std::string const& name) const;
Section const&
operator[] (std::string const& name) const
{
return section(name);
}
/** @} */
/** Overwrite a key/value pair with a command line argument
If the section does not exist it is created.
The previous value, if any, is overwritten.
*/
void
overwrite (std::string const& section, std::string const& key,
std::string const& value);
friend
std::ostream&
operator<< (std::ostream& ss, BasicConfig const& c);
protected:
void
build (IniFileSections const& ifs);
/** Insert a legacy single section as a key/value pair.
Does nothing if the section does not exist, or does not contain
a single line that is not a key/value pair.
@deprecated
*/
void
remap (std::string const& legacy_section,
std::string const& key, std::string const& new_section);
};
} // ripple
#endif

22
src/ripple/basics/impl/BasicConfig.cpp
View File

@@ -32,7 +32,7 @@ Section::set (std::string const& key, std::string const& value)
}
void
Section::append (std::string const& line)
Section::append (std::vector <std::string> const& lines)
{
// <key> '=' <value>
static boost::regex const re1 (
@@ -47,18 +47,16 @@ Section::append (std::string const& line)
, boost::regex_constants::optimize
);
boost::smatch match;
lines_.push_back (line);
if (boost::regex_match (line, match, re1))
set (match[1], match[2]);
}
void
Section::append (std::vector <std::string> const& lines)
{
lines_.reserve (lines_.size() + lines.size());
std::for_each (lines.begin(), lines.end(),
[&](std::string const& line) { this->append (line); });
for (auto const& line : lines)
{
boost::smatch match;
lines_.push_back (line);
if (boost::regex_match (line, match, re1))
set (match[1], match[2]);
else
values_.push_back (line);
}
}
bool