flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 07:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #885 Regenerate revision file from available JSON files.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2017-02-19 19:21:30 +00:00
parent e7f61dabea
commit c268581954
4 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/blackmisc/valuecache.cpp
View File

@@ -402,7 +402,7 @@ namespace BlackMisc
return status;
}
CStatusMessage CValueCache::loadFromFiles(const QString &dir, const QSet<QString> &keys, const CVariantMap &currentValues, CValueCachePacket &o_values, const QString &keysMessage) const
CStatusMessage CValueCache::loadFromFiles(const QString &dir, const QSet<QString> &keys, const CVariantMap &currentValues, CValueCachePacket &o_values, const QString &keysMessage, bool keysOnly) const
{
if (! QDir(dir).exists())
{
@@ -442,15 +442,23 @@ namespace BlackMisc
{
return CStatusMessage(this).error("Invalid JSON format in %1") << file.fileName();
}
CVariantMap temp;
const QString messagePrefix = QStringLiteral("Parsing %1.json").arg(it.key());
auto messages = temp.convertFromMemoizedJsonNoThrow(json.object(), it.value(), this, messagePrefix);
if (it.value().isEmpty()) { messages.push_back(temp.convertFromMemoizedJsonNoThrow(json.object(), this, messagePrefix)); }
if (! messages.isEmpty())
if (keysOnly)
{
ok = false;
backupFile(file);
CLogMessage::preformatted(messages);
for (const auto &key : json.object().keys()) { temp.insert(key, {}); }
}
else
{
const QString messagePrefix = QStringLiteral("Parsing %1.json").arg(it.key());
auto messages = temp.convertFromMemoizedJsonNoThrow(json.object(), it.value(), this, messagePrefix);
if (it.value().isEmpty()) { messages.push_back(temp.convertFromMemoizedJsonNoThrow(json.object(), this, messagePrefix)); }
if (! messages.isEmpty())
{
ok = false;
backupFile(file);
CLogMessage::preformatted(messages);
}
}
temp.removeDuplicates(currentValues);
o_values.insert(temp, QFileInfo(file).lastModified().toMSecsSinceEpoch());