Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-16 22:00:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14519 from MattHardcastle/use-qsavefile

Browse source 
Use QSaveFile when persisting domain settings to disk
This commit is contained in:
Shannon Romano 2019-05-15 13:41:34 -07:00 committed by GitHub
commit b5f23f550f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -22,6 +22,7 @@
#include <QtCore/QThread> #include <QtCore/QThread>
#include <QtCore/QUrl> #include <QtCore/QUrl>
#include <QtCore/QUrlQuery> #include <QtCore/QUrlQuery>
#include <QSaveFile>
#include <AccountManager.h> #include <AccountManager.h>
#include <Assignment.h> #include <Assignment.h>
@ -1712,28 +1713,44 @@ void DomainServerSettingsManager::sortPermissions() {
} }
void DomainServerSettingsManager::persistToFile() { void DomainServerSettingsManager::persistToFile() {
sortPermissions(); QString settingsFilename = _configMap.getUserConfigFilename();
QDir settingsDir = QFileInfo(settingsFilename).dir();
// make sure we have the dir the settings file is supposed to live in if (!settingsDir.exists() && !settingsDir.mkpath(".")) {
QFileInfo settingsFileInfo(_configMap.getUserConfigFilename()); // If the path already exists when the `mkpath` method is
// called, it will return true. It will only return false if the
if (!settingsFileInfo.dir().exists()) { // path doesn't exist after the call returns.
settingsFileInfo.dir().mkpath("."); qCritical("Could not create the settings file parent directory. Unable to persist settings.");
}
QFile settingsFile(_configMap.getUserConfigFilename());
if (settingsFile.open(QIODevice::WriteOnly)) {
// take a read lock so we can grab the config and write it to file
QReadLocker locker(&_settingsLock);
settingsFile.write(QJsonDocument::fromVariant(_configMap.getConfig()).toJson());
} else {
qCritical("Could not write to JSON settings file. Unable to persist settings.");
// failed to write, reload whatever the current config state is
// with a write lock since we're about to overwrite the config map
QWriteLocker locker(&_settingsLock); QWriteLocker locker(&_settingsLock);
_configMap.loadConfig(); _configMap.loadConfig();
return;
}
QSaveFile settingsFile(settingsFilename);
if (!settingsFile.open(QIODevice::WriteOnly)) {
qCritical("Could not open the JSON settings file. Unable to persist settings.");
QWriteLocker locker(&_settingsLock);
_configMap.loadConfig();
return;
}
sortPermissions();
QVariantMap conf;
{
QReadLocker locker(&_settingsLock);
conf = _configMap.getConfig();
}
QByteArray json = QJsonDocument::fromVariant(conf).toJson();
if (settingsFile.write(json) == -1) {
qCritical("Could not write to JSON settings file. Unable to persist settings.");
QWriteLocker locker(&_settingsLock);
_configMap.loadConfig();
return;
}
if (!settingsFile.commit()) {
qCritical("Could not commit writes to JSON settings file. Unable to persist settings.");
QWriteLocker locker(&_settingsLock);
_configMap.loadConfig();
return; // defend against future code
} }
} }