9b35062bb9
The case of property names does not matter. A map where the key is case-insensitive is thus a better data structure for storing a set of property key/value pairs. Such a type was already used by FilterConfigNode. This patch cleans up the config nodes so that all of them use the new ConfigProps type. The previous typedefs inside ConfigNode and FilterConfigNode are preserved to keep old source code working without changing it. The intention is to use the result of readProperties() directly as parameter for setConfigFilter().
153 lines
3.9 KiB
C++
153 lines
3.9 KiB
C++
/*
|
|
* Copyright (C) 2008-2009 Patrick Ohly <patrick.ohly@gmx.de>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) version 3.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
* 02110-1301 USA
|
|
*/
|
|
|
|
#include <syncevo/SafeConfigNode.h>
|
|
#include <syncevo/SyncContext.h>
|
|
|
|
#include <boost/foreach.hpp>
|
|
|
|
#include <syncevo/declarations.h>
|
|
SE_BEGIN_CXX
|
|
|
|
SafeConfigNode::SafeConfigNode(const boost::shared_ptr<ConfigNode> &node) :
|
|
m_node(node),
|
|
m_readOnlyNode(node),
|
|
m_strictMode(true)
|
|
{
|
|
}
|
|
|
|
SafeConfigNode::SafeConfigNode(const boost::shared_ptr<const ConfigNode> &node) :
|
|
m_readOnlyNode(node),
|
|
m_strictMode(true)
|
|
{
|
|
}
|
|
|
|
string SafeConfigNode::readProperty(const string &property) const
|
|
{
|
|
return unescape(m_readOnlyNode->readProperty(escape(property)));
|
|
}
|
|
|
|
void SafeConfigNode::setProperty(const string &property,
|
|
const string &value,
|
|
const string &comment,
|
|
const string *defValue)
|
|
{
|
|
m_node->setProperty(escape(property),
|
|
escape(value),
|
|
comment,
|
|
defValue);
|
|
}
|
|
|
|
void SafeConfigNode::readProperties(ConfigProps &props) const
|
|
{
|
|
ConfigProps original;
|
|
m_readOnlyNode->readProperties(original);
|
|
|
|
BOOST_FOREACH(const StringPair &prop, original) {
|
|
string key = unescape(prop.first);
|
|
string value = unescape(prop.second);
|
|
|
|
props[key] = value;
|
|
}
|
|
}
|
|
|
|
void SafeConfigNode::removeProperty(const string &property)
|
|
{
|
|
m_node->removeProperty(escape(property));
|
|
}
|
|
|
|
void SafeConfigNode::flush()
|
|
{
|
|
if (!m_node.get()) {
|
|
SyncContext::throwError(getName() + ": read-only, flushing not allowed");
|
|
}
|
|
m_node->flush();
|
|
}
|
|
|
|
string SafeConfigNode::escape(const string &str, bool allSpaces, bool strictMode)
|
|
{
|
|
string res;
|
|
char buffer[4];
|
|
bool isLeadingSpace = true;
|
|
res.reserve(str.size() * 3);
|
|
|
|
BOOST_FOREACH(char c, str) {
|
|
if(strictMode ?
|
|
(isalnum(c) ||
|
|
c == '-' ||
|
|
c == '_') :
|
|
!(((isLeadingSpace || allSpaces) && isspace(c)) ||
|
|
c == '=' ||
|
|
c == '!' ||
|
|
c == '\r' ||
|
|
c == '\n')) {
|
|
res += c;
|
|
if (!isspace(c)) {
|
|
isLeadingSpace = false;
|
|
}
|
|
} else {
|
|
sprintf(buffer, "!%02x",
|
|
(unsigned int)(unsigned char)c);
|
|
res += buffer;
|
|
}
|
|
}
|
|
|
|
// also encode trailing space?
|
|
if (!strictMode || allSpaces) {
|
|
size_t numspaces = 0;
|
|
ssize_t off = res.size() - 1;
|
|
while (off >= 0 && isspace(res[off])) {
|
|
off--;
|
|
numspaces++;
|
|
}
|
|
res.resize(res.size() - numspaces);
|
|
BOOST_FOREACH(char c, str.substr(str.size() - numspaces)) {
|
|
sprintf(buffer, "!%02x",
|
|
(unsigned int)(unsigned char)c);
|
|
res += buffer;
|
|
}
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
string SafeConfigNode::unescape(const string &str)
|
|
{
|
|
string res;
|
|
size_t curr;
|
|
|
|
res.reserve(str.size());
|
|
|
|
curr = 0;
|
|
while (curr < str.size()) {
|
|
if (str[curr] == '!') {
|
|
string hex = str.substr(curr + 1, 2);
|
|
res += (char)strtol(hex.c_str(), NULL, 16);
|
|
curr += 3;
|
|
} else {
|
|
res += str[curr];
|
|
curr++;
|
|
}
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
SE_END_CXX
|