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

refs #815 Throw CJsonException when required JSON objects are not found.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-12-18 04:44:25 +00:00
parent 7c5c9d30e6
commit bbdbd26f82
10 changed files with 112 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -698,13 +698,34 @@ namespace BlackMisc
void CAircraftModelList::convertFromMemoizedJson(const QJsonObject &json)
{
clear();
QJsonArray array = json.value("containerbase").toArray();
QJsonValue value = json.value("containerbase");
if (value.isUndefined()) { throw CJsonException("Missing 'containerbase'"); }
QJsonArray array = value.toArray();
CAircraftModel::MemoHelper::CUnmemoizer helper;
helper.getTable<CAircraftIcaoCode>().convertFromJson(json.value("aircraftIcaos").toObject());
helper.getTable<CLivery>().convertFromJson(json.value("liveries").toObject());
helper.getTable<CDistributor>().convertFromJson(json.value("distributors").toObject());
QJsonValue aircraftIcaos = json.value("aircraftIcaos");
QJsonValue liveries = json.value("liveries");
QJsonValue distributors = json.value("distributors");
if (aircraftIcaos.isUndefined()) { throw CJsonException("Missing 'aircraftIcaos'"); }
if (liveries.isUndefined()) { throw CJsonException("Missing 'liveries'"); }
if (distributors.isUndefined()) { throw CJsonException("Missing 'distributors'"); }
{
CJsonScope scope("aircraftIcaos");
helper.getTable<CAircraftIcaoCode>().convertFromJson(aircraftIcaos.toObject());
}
{
CJsonScope scope("liveries");
helper.getTable<CLivery>().convertFromJson(liveries.toObject());
}
{
CJsonScope scope("distributors");
helper.getTable<CDistributor>().convertFromJson(distributors.toObject());
}
int index = 0;
for (auto i = array.begin(); i != array.end(); ++i)
{
CJsonScope scope("containerbase", index++);
CAircraftModel value;
value.convertFromMemoizedJson(i->toObject(), helper);
insert(value);

3
src/blackmisc/simulation/simulatorplugininfo.cpp
View File

@@ -27,7 +27,10 @@ namespace BlackMisc
{
if (json.contains("IID")) // comes from the plugin
{
if (! json.contains("MetaData")) { throw CJsonException("Missing 'MetaData'"); }
// json data is already validated by CPluginManagerSimulator
CJsonScope scope("MetaData");
CValueObject::convertFromJson(json["MetaData"].toObject());
m_valid = true;
}