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

Ref T264, improved detection of multiple container formats

Browse Source
This commit is contained in:
Klaus Basan
2018-05-22 11:20:24 +02:00
parent ef3f312bc5
commit 1d8bbaf3be
4 changed files with 82 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/blackmisc/json.cpp
View File

@@ -58,7 +58,7 @@ const QJsonValue &operator >>(const QJsonValue &json, QString &value)
const QJsonValue &operator >>(const QJsonValue &json, QStringList &value)
{
for (auto && element : json.toArray()) { value << element.toString(); }
for (auto &&element : json.toArray()) { value << element.toString(); }
return json;
}
@@ -132,7 +132,7 @@ QJsonValueRef operator >>(QJsonValueRef json, QString &value)
QJsonValueRef operator >>(QJsonValueRef json, QStringList &value)
{
for (auto && element : json.toArray()) { value << element.toString(); }
for (auto &&element : json.toArray()) { value << element.toString(); }
return json;
}
@@ -473,16 +473,31 @@ namespace BlackMisc
return looksLikeJson(json);
}
bool looksLikeSwiftDataObject(const QJsonObject &object)
bool looksLikeSwiftDataObjectJson(const QJsonObject &object)
{
// key
// - type
// - value
if (object.size() != 1) { return false; }
const QString key = object.keys().front();
const QStringList keys = object.keys();
if (keys.size() != 1) { return false; }
const QString key = keys.front();
const QJsonObject cacheObject = object.value(key).toObject();
return (cacheObject.contains("type") && cacheObject.contains("value"));
}
QJsonObject swiftDataObjectValue(const QString &jsonString)
{
const QJsonObject obj = jsonObjectFromString(jsonString);
if (obj.isEmpty()) { return obj; }
return swiftDataObjectValue(obj);
}
QJsonObject swiftDataObjectValue(const QJsonObject &object)
{
// key
// - type
// - value
if (object.size() != 1) { return object; } // no cache format
const QString key = object.keys().front();
const QJsonObject cacheObject = object.value(key).toObject();
@@ -510,13 +525,6 @@ namespace BlackMisc
return object;
}
QJsonObject swiftDataObjectValue(const QString &jsonString)
{
const QJsonObject obj = jsonObjectFromString(jsonString);
if (obj.isEmpty()) { return obj; }
return swiftDataObjectValue(obj);
}
QJsonObject unwrapCache(const QString &jsonString)
{
@@ -530,5 +538,15 @@ namespace BlackMisc
// CContainerbase::convertFromJson
return object.contains("containerbase");
}
bool looksLikeSwiftTypeValuePairJson(const QJsonObject &object)
{
return (object.contains("type") && object.contains("value"));
}
bool looksLikeSwiftDbJson(const QJsonObject &object)
{
return (object.contains("data"));
}
} // ns
} // ns