169adb3d91
The "type" property is special because it must be set in the per-peer config node (backend and data format) and in the shared config node (only backend relevant). The MultiplexConfigNode picks the right node, but that was based on the (invalid) assumption that the peer nodes would be NULL when not in use. What really happens is that dummy instances are used, to allow writing into these nodes. Because of this false assumption, the "type" for the context was always printed as the default "select backend". Fixed by telling the MultiplexConfigNode that its peer nodes are dummies. In addition, setting the "type" property for a context didn't work because copyProperties() treated "type" as a per-peer property which had to be skipped. Fixed by teaching it about the special case. The D-Bus and Cmdline tests were extended to cover these cases. They failed (as expected) before fixing the implementation.
108 lines
4 KiB
C++
108 lines
4 KiB
C++
/*
|
|
* Copyright (C) 2009 Intel Corporation
|
|
*
|
|
* 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
|
|
*/
|
|
#ifndef INCL_SYNCEVO_MULTIPLEX_CONFIG_NODE
|
|
# define INCL_SYNCEVO_MULTIPLEX_CONFIG_NODE
|
|
|
|
#include <syncevo/declarations.h>
|
|
#include <syncevo/ConfigNode.h>
|
|
#include <syncevo/SyncConfig.h>
|
|
SE_BEGIN_CXX
|
|
|
|
/**
|
|
* Joins properties from the different nodes that might be used by a
|
|
* SyncConfig or SyncSourceConfig (global/shared/not shared,
|
|
* hidden/user-visible) and presents them as one node. Reading takes
|
|
* the union of all set properties. Writing is directed to the
|
|
* node for which the property was registered.
|
|
*/
|
|
class MultiplexConfigNode : public FilterConfigNode
|
|
{
|
|
const std::string m_name;
|
|
boost::shared_ptr<FilterConfigNode> m_nodes[2][3];
|
|
const ConfigPropertyRegistry &m_registry;
|
|
bool m_havePeerNodes;
|
|
int m_hiddenLower, m_hiddenUpper;
|
|
|
|
FilterConfigNode *getNode(const string &property,
|
|
const ConfigProperty **prop = NULL) const;
|
|
|
|
public:
|
|
/** join both hidden and user-visible properties */
|
|
MultiplexConfigNode(const std::string &name,
|
|
const ConfigPropertyRegistry ®istry) :
|
|
FilterConfigNode(boost::shared_ptr<ConfigNode>()),
|
|
m_name(name),
|
|
m_registry(registry),
|
|
m_havePeerNodes(true),
|
|
m_hiddenLower(0), m_hiddenUpper(1) {}
|
|
|
|
/** only join hidden or user-visible properties */
|
|
MultiplexConfigNode(const std::string &name,
|
|
const ConfigPropertyRegistry ®istry,
|
|
bool hidden) :
|
|
FilterConfigNode(boost::shared_ptr<ConfigNode>()),
|
|
m_name(name),
|
|
m_registry(registry),
|
|
m_havePeerNodes(true),
|
|
m_hiddenLower(hidden), m_hiddenUpper(hidden) {}
|
|
|
|
/** true when peer nodes are used (default), false when they are dummy nodes */
|
|
bool getHavePeerNodes() const { return m_havePeerNodes; }
|
|
void setHavePeerNodes(bool havePeerNodes) { m_havePeerNodes = havePeerNodes; }
|
|
|
|
/** configure the nodes to use */
|
|
void setNode(bool hidden, ConfigProperty::Sharing sharing,
|
|
const boost::shared_ptr<FilterConfigNode> &node) {
|
|
m_nodes[hidden][sharing] = node;
|
|
}
|
|
void setNode(bool hidden, ConfigProperty::Sharing sharing,
|
|
const boost::shared_ptr<ConfigNode> &node) {
|
|
m_nodes[hidden][sharing].reset(new FilterConfigNode(node));
|
|
}
|
|
|
|
virtual void addFilter(const string &property,
|
|
const string &value);
|
|
virtual void setFilter(const ConfigFilter &filter);
|
|
|
|
virtual string getName() const { return m_name; }
|
|
virtual void flush();
|
|
virtual string readProperty(const string &property) const;
|
|
virtual void setProperty(const string &property,
|
|
const string &value,
|
|
const string &comment = string(""),
|
|
const string *defValue = NULL);
|
|
virtual void readProperties(PropsType &props) const;
|
|
|
|
/*
|
|
* removing or clearing something is not implemented because it is
|
|
* not certain what should be deleted: only properties which are
|
|
* not shared?!
|
|
*/
|
|
virtual void removeProperty(const string &property);
|
|
virtual void clear();
|
|
|
|
/**
|
|
* true if any of the nodes exists
|
|
*/
|
|
virtual bool exists() const;
|
|
};
|
|
|
|
SE_END_CXX
|
|
|
|
#endif // INCL_SYNCEVO_MULTIPLEX_CONFIG_NODE
|