flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-25 18:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #646 Using new CStatusMessage construction style in CValueCache.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-05-18 20:32:10 +01:00
parent 05b5971caf
commit 74f577eec9
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/blackmisc/valuecache.cpp
View File

@@ -278,19 +278,19 @@ namespace BlackMisc
} }
if (! QDir::root().mkpath(dir)) if (! QDir::root().mkpath(dir))
{ {
return CStatusMessage(this, CStatusMessage::SeverityError, "Failed to create directory " + dir); return CStatusMessage(this).error("Failed to create directory %1") << dir;
} }
for (auto it = namespaces.cbegin(); it != namespaces.cend(); ++it) for (auto it = namespaces.cbegin(); it != namespaces.cend(); ++it)
{ {
CAtomicFile file(dir + "/" + it.key() + ".json"); CAtomicFile file(dir + "/" + it.key() + ".json");
if (! file.open(QFile::ReadWrite | QFile::Text)) if (! file.open(QFile::ReadWrite | QFile::Text))
{ {
return CStatusMessage(this, CStatusMessage::SeverityError, QString("Failed to open %1: %2").arg(file.fileName()).arg(file.errorString())); return CStatusMessage(this).error("Failed to open %1: %2") << file.fileName() << file.errorString();
} }
auto json = QJsonDocument::fromJson(file.readAll()); auto json = QJsonDocument::fromJson(file.readAll());
if (json.isArray() || (json.isNull() && ! json.isEmpty())) if (json.isArray() || (json.isNull() && ! json.isEmpty()))
{ {
return CStatusMessage(this, CStatusMessage::SeverityError, "Invalid JSON format in " + file.fileName()); return CStatusMessage(this).error("Invalid JSON format in %1") << file.fileName();
} }
CVariantMap storedValues; CVariantMap storedValues;
storedValues.convertFromJson(json.object()); storedValues.convertFromJson(json.object());
@@ -299,12 +299,10 @@ namespace BlackMisc
if (!(file.seek(0) && file.resize(0) && file.write(json.toJson()) > 0 && file.checkedClose())) if (!(file.seek(0) && file.resize(0) && file.write(json.toJson()) > 0 && file.checkedClose()))
{ {
return CStatusMessage(this, CStatusMessage::SeverityError, return CStatusMessage(this).error("Failed to write to %1: %2") << file.fileName() << file.errorString();
QString("Failed to write to %1: %2").arg(file.fileName()).arg(file.errorString()));
} }
} }
return CStatusMessage(this, CStatusMessage::SeverityInfo, return CStatusMessage(this).info("Written %1 to value cache in %2") << values.keys().to<QStringList>().join(",") << dir;
QString("Written %1 to value cache in %2").arg(values.keys().to<QStringList>().join(",")).arg(dir));
} }
CStatusMessage CValueCache::loadFromFiles(const QString &dir) CStatusMessage CValueCache::loadFromFiles(const QString &dir)
@@ -321,7 +319,7 @@ namespace BlackMisc
{ {
if (! QDir(dir).isReadable()) if (! QDir(dir).isReadable())
{ {
return CStatusMessage(this, CStatusMessage::SeverityError, "Failed to create directory " + dir); return CStatusMessage(this).error("Failed to create directory %1") << dir;
} }
const QStringList entries(QDir(dir).entryList({ "*.json" }, QDir::Files)); const QStringList entries(QDir(dir).entryList({ "*.json" }, QDir::Files));
@@ -330,12 +328,12 @@ namespace BlackMisc
QFile file(dir + "/" + filename); QFile file(dir + "/" + filename);
if (! file.open(QFile::ReadOnly | QFile::Text)) if (! file.open(QFile::ReadOnly | QFile::Text))
{ {
return CStatusMessage(this, CStatusMessage::SeverityError, QString("Failed to open %1: %2").arg(file.fileName()).arg(file.errorString())); return CStatusMessage(this).error("Failed to open %1: %2") << file.fileName() << file.errorString();
} }
auto json = QJsonDocument::fromJson(file.readAll()); auto json = QJsonDocument::fromJson(file.readAll());
if (json.isArray() || (json.isNull() && ! json.isEmpty())) if (json.isArray() || (json.isNull() && ! json.isEmpty()))
{ {
return CStatusMessage(this, CStatusMessage::SeverityError, "Invalid JSON format in " + file.fileName()); return CStatusMessage(this).error("Invalid JSON format in %1") << file.fileName();
} }
CVariantMap temp; CVariantMap temp;
temp.convertFromJson(json.object()); temp.convertFromJson(json.object());
@@ -346,8 +344,7 @@ namespace BlackMisc
temp.removeDuplicates(currentValues); temp.removeDuplicates(currentValues);
o_values.insert(temp, QFileInfo(file).lastModified().toMSecsSinceEpoch()); o_values.insert(temp, QFileInfo(file).lastModified().toMSecsSinceEpoch());
} }
return CStatusMessage(this, CStatusMessage::SeverityInfo, return CStatusMessage(this).info("Loaded cache values %1 from %2") << o_values.keys().to<QStringList>().join(",") << dir;
QString("Loaded cache values %1 from %2").arg(o_values.keys().to<QStringList>().join(",")).arg(dir));
} }
void CValueCache::markAllAsSaved(const QString &keyPrefix) void CValueCache::markAllAsSaved(const QString &keyPrefix)
@@ -508,7 +505,7 @@ namespace BlackMisc
emit valuesWantToCache({ { { element.m_key, value } }, timestamp, save }); emit valuesWantToCache({ { { element.m_key, value } }, timestamp, save });
} }
// All good info // All good info
status = CStatusMessage(this, CStatusMessage::SeverityInfo, "Set values in " + element.m_key); status = CStatusMessage(this).info("Set values in %1") << element.m_key;
} }
return status; return status;
} }
@@ -613,15 +610,15 @@ namespace BlackMisc
{ {
if (! value.isValid()) if (! value.isValid())
{ {
return CStatusMessage(this, invalidSeverity, "Empty cache value " + element.m_key, true); return CStatusMessage(this, invalidSeverity, QString("Empty cache value %1").arg(element.m_key), true);
} }
else if (value.userType() != element.m_metaType) else if (value.userType() != element.m_metaType)
{ {
return CStatusMessage(this, CStatusMessage::SeverityError, QString("Expected ") + QMetaType::typeName(element.m_metaType) + " but got " + value.typeName() + " for " + element.m_key, true); return CStatusMessage(this).error("Expected %1 but got %2 for %3") << QMetaType::typeName(element.m_metaType) << value.typeName() << element.m_key;
} }
else if (element.m_validator && ! element.m_validator(value)) else if (element.m_validator && ! element.m_validator(value))
{ {
return CStatusMessage(this, CStatusMessage::SeverityError, value.toQString() + " is not valid for " + element.m_key, true); return CStatusMessage(this).error("%1 is not valid for %2") << value.toQString() << element.m_key;
} }
else else
{ {