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

Ref T554, parse response of auto publishing

Browse Source
This commit is contained in:
Klaus Basan
2019-03-14 03:37:08 +01:00
committed by Mat Sutcliffe
parent 19e421838d
commit c8eb8ecc2d
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/blackmisc/db/datastoreutility.cpp
View File

@@ -158,5 +158,45 @@ namespace BlackMisc
return hasData;
}
bool CDatastoreUtility::parseAutoPublishResponse(const QString &jsonResponse, CStatusMessageList &messages)
{
if (jsonResponse.isEmpty())
{
messages.push_back(CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, u"Empty JSON data for published models"));
return false;
}
const QJsonDocument jsonDoc(QJsonDocument::fromJson(jsonResponse.toUtf8()));
// array of messages only
if (jsonDoc.isArray())
{
const CStatusMessageList msgs(CStatusMessageList::fromDatabaseJson(jsonDoc.array()));
messages.push_back(msgs);
return true;
}
// no object -> most likely some fucked up HTML string with the PHP error
if (!jsonDoc.isObject())
{
const QString phpError(CNetworkUtils::removeHtmlPartsFromPhpErrorMessage(jsonResponse));
messages.push_back(CStatusMessage(getLogCategories(), CStatusMessage::SeverityError, phpError));
return false;
}
QJsonObject json(jsonDoc.object());
if (json.contains("msgs"))
{
const QJsonValue msgJson(json.take("msgs"));
const CStatusMessageList msgs(CStatusMessageList::fromDatabaseJson(msgJson.toArray()));
if (!msgs.isEmpty())
{
messages.push_back(msgs);
return !messages.hasErrorMessages();
}
}
return false;
}
} // ns
} // ns

3
src/blackmisc/db/datastoreutility.h
View File

@@ -56,6 +56,9 @@ namespace BlackMisc
Simulation::CAircraftModelList &publishedModels,
Simulation::CAircraftModelList &skippedModels,
CStatusMessageList &messages, bool &directWrite);
//! Auto publish response
static bool parseAutoPublishResponse(const QString &jsonResponse, CStatusMessageList &messages);
};
} // namespace
} // namespace