7bd113e946
This patch introduces additional semantic for SetConfig(update=False, {})
(= removing configuration) and SetConfig(update=False, {<some sources removed>}
(= removing sources): when the config view is for a specific peer, then
only properties specific to that peer are removed.
When the view is peer-independent, it removes the complete
configuration (including all peers) resp. removes the shared and
per-peer source settings in all peers.
Global properties are never removed. With this patch, they can be read
by selecting the "@default" (= "") config view. Previously, reading
this view was rejected unless it contained real config nodes.
ConfigTree::removeSubtree() was merged into ConfigTree::remove(). The
functions were clearly related. The tree remains usable in the revised
remove() call.
SyncConfig::remove() did not work since the introduction of the "nodes
not in use" check in FileConfigTree::reset(). SyncConfig has to drop
all references to config nodes before FileConfigTree::remove() can do
its job. This is done via a new SyncConfig::makeVolatile().
test-dbus.py was updated to cover the new remove/clear
semantic. Because clearing sources with the "dummy-test-for-config"
view only removes some source properties, the remaining ones are still
reported in testClearConfigSources, breaking it. The test is
superseeded by the new tests and thus was removed.
84 lines
2.6 KiB
C++
84 lines
2.6 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
|
|
*/
|
|
|
|
#ifndef INCL_EVOLUTION_FILE_CONFIG_TREE
|
|
# define INCL_EVOLUTION_FILE_CONFIG_TREE
|
|
|
|
#include <ConfigTree.h>
|
|
|
|
#include <string>
|
|
#include <map>
|
|
|
|
#include <syncevo/declarations.h>
|
|
SE_BEGIN_CXX
|
|
using namespace std;
|
|
|
|
/**
|
|
* This implementation maps nodes to plain .ini style files below an
|
|
* absolute directory of the filesystem. The caller is responsible for
|
|
* choosing that directory and how hidden and user-visible files are
|
|
* to be named.
|
|
*/
|
|
class FileConfigTree : public ConfigTree {
|
|
public:
|
|
/**
|
|
* @param root absolute filesystem path for
|
|
* .syncj4/evolution or .config/syncevolution
|
|
* @param peer the relative path to the peer configuration
|
|
* @param oldLayout true: use pre-0.7 file names
|
|
*/
|
|
FileConfigTree(const string &root,
|
|
const string &peer,
|
|
bool oldLayout);
|
|
|
|
void setReadOnly(bool readonly) { m_readonly = readonly; }
|
|
bool getReadOnly() const { return m_readonly; }
|
|
|
|
/* ConfigTree API */
|
|
virtual string getRootPath() const;
|
|
virtual void flush();
|
|
virtual void remove(const string &path);
|
|
virtual void reset();
|
|
virtual boost::shared_ptr<ConfigNode> open(const string &path,
|
|
PropertyType type,
|
|
const string &otherId = string(""));
|
|
list<string> getChildren(const string &path);
|
|
|
|
private:
|
|
/**
|
|
* remove all nodes from the node cache which are located at 'fullpath'
|
|
* or are contained inside it
|
|
*/
|
|
void clearNodes(const string &fullpath);
|
|
|
|
private:
|
|
const string m_root;
|
|
const string m_peer;
|
|
const bool m_oldLayout;
|
|
bool m_readonly;
|
|
|
|
typedef map< string, boost::shared_ptr<ConfigNode> > NodeCache_t;
|
|
/** cache of all nodes ever accessed */
|
|
NodeCache_t m_nodes;
|
|
};
|
|
|
|
|
|
SE_END_CXX
|
|
#endif
|