summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
1604924)
- separate parsed config from Quassel's .oidentd.conf lines
- move mutexes to parse/writeConfig
+OidentdConfigGenerator::~OidentdConfigGenerator() {
+ _quasselConfig.clear();
+ writeConfig();
+}
+
bool OidentdConfigGenerator::init() {
configDir = QDir::homePath();
configFileName = ".oidentd.conf";
bool OidentdConfigGenerator::init() {
configDir = QDir::homePath();
configFileName = ".oidentd.conf";
quasselStanzaTemplate = QString("lport %1 { reply \"%2\" } #%3\n");
quasselStanzaRx = QRegExp(QString("^lport .* \\{ .* \\} #%1\\r?\\n").arg(configTag));
quasselStanzaTemplate = QString("lport %1 { reply \"%2\" } #%3\n");
quasselStanzaRx = QRegExp(QString("^lport .* \\{ .* \\} #%1\\r?\\n").arg(configTag));
// initially remove all Quassel stanzas that might be present
if (parseConfig(false) && writeConfig())
_initialized = true;
// initially remove all Quassel stanzas that might be present
if (parseConfig(false) && writeConfig())
_initialized = true;
Q_UNUSED(localAddress) Q_UNUSED(peerAddress) Q_UNUSED(peerPort)
QString ident = identity->ident();
Q_UNUSED(localAddress) Q_UNUSED(peerAddress) Q_UNUSED(peerPort)
QString ident = identity->ident();
- _config.append(quasselStanzaTemplate.arg(localPort).arg(ident).arg(configTag));
+ _quasselConfig.append(quasselStanzaTemplate.arg(localPort).arg(ident).arg(configTag));
bool ret = writeConfig();
bool ret = writeConfig();
-bool OidentdConfigGenerator::parseConfig(bool keepQuasselStanzas) {
+bool OidentdConfigGenerator::parseConfig(bool readQuasselStanzas) {
if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite))
return false;
if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite))
return false;
- QByteArray parsedConfig;
+ _parsedConfig.clear();
+ _configFile->seek(0);
while (!_configFile->atEnd()) {
QByteArray line = _configFile->readLine();
while (!_configFile->atEnd()) {
QByteArray line = _configFile->readLine();
- if (keepQuasselStanzas || !lineByUs(line))
- parsedConfig.append(line);
+ if (!lineByUs(line))
+ _parsedConfig.append(line);
+ else if (readQuasselStanzas)
+ _quasselConfig.append(line);
- _config = parsedConfig;
-
+ _configFile->close();
+ _mutex.unlock();
return true;
}
bool OidentdConfigGenerator::writeConfig() {
if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite | QIODevice::Text))
return false;
return true;
}
bool OidentdConfigGenerator::writeConfig() {
if (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite | QIODevice::Text))
return false;
_configFile->seek(0);
_configFile->resize(0);
_configFile->seek(0);
_configFile->resize(0);
- _configFile->write(_config);
+ _configFile->write(_parsedConfig);
+ _configFile->write(_quasselConfig);
- return _configFile->flush();
+ _configFile->close();
+ _mutex.unlock();
+ return true;
}
bool OidentdConfigGenerator::lineByUs(const QByteArray &line) {
}
bool OidentdConfigGenerator::lineByUs(const QByteArray &line) {
Q_OBJECT
public:
explicit OidentdConfigGenerator(QObject *parent = 0);
Q_OBJECT
public:
explicit OidentdConfigGenerator(QObject *parent = 0);
+ ~OidentdConfigGenerator();
private:
bool init();
bool writeConfig();
private:
bool init();
bool writeConfig();
- bool parseConfig(bool keepQuasselStanzas = true);
+ bool parseConfig(bool readQuasselStanzas = false);
bool lineByUs(const QByteArray &line);
bool _initialized;
QDateTime _lastSync;
QFile *_configFile;
bool lineByUs(const QByteArray &line);
bool _initialized;
QDateTime _lastSync;
QFile *_configFile;
+ QByteArray _parsedConfig;
+ QByteArray _quasselConfig;
// Mutex isn't strictly necessary at the moment, since with the current invocation in Core only one instance at a time exists
QMutex _mutex;
// Mutex isn't strictly necessary at the moment, since with the current invocation in Core only one instance at a time exists
QMutex _mutex;