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

Ref T118, formatting database writer and utility

Browse Source
This commit is contained in:
Klaus Basan
2017-10-20 18:58:16 +02:00
parent dd9cff778f
commit f14f06317b
4 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackcore/db/databasewriter.cpp
View File

@@ -59,7 +59,7 @@ namespace BlackCore
if (this->isReplyOverdue())
{
bool killed = this->killPendingReply();
const bool killed = this->killPendingReply();
if (killed)
{
const CStatusMessage msg(CStatusMessage::SeverityWarning, "Aborted outdated pending reply");
@@ -88,7 +88,7 @@ namespace BlackCore
QNetworkRequest request(url);
CNetworkUtils::ignoreSslVerification(request);
const int logId = m_writeLog.addPendingUrl(url);
m_pendingReply = sApp->postToNetwork(request, logId, multiPart, { this, &CDatabaseWriter::ps_postModelsResponse});
m_pendingReply = sApp->postToNetwork(request, logId, multiPart, { this, &CDatabaseWriter::postedModelsResponse});
m_replyPendingSince = QDateTime::currentMSecsSinceEpoch();
return msgs;
}
@@ -105,7 +105,7 @@ namespace BlackCore
return n;
}
void CDatabaseWriter::ps_postModelsResponse(QNetworkReply *nwReplyPtr)
void CDatabaseWriter::postedModelsResponse(QNetworkReply *nwReplyPtr)
{
static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::swiftDbWebservice()}));
QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
@@ -125,7 +125,7 @@ namespace BlackCore
if (dataFileData.isEmpty())
{
const CStatusMessageList msgs({CStatusMessage(cats, CStatusMessage::SeverityError, "No response data from " + urlString)});
emit publishedModels(CAircraftModelList(), CAircraftModelList(), msgs, false, false);
emit this->publishedModels(CAircraftModelList(), CAircraftModelList(), msgs, false, false);
return;
}
@@ -134,14 +134,14 @@ namespace BlackCore
CStatusMessageList msgs;
bool directWrite;
const bool sendingSuccessful = CDatastoreUtility::parseSwiftPublishResponse(dataFileData, modelsPublished, modelsSkipped, msgs, directWrite);
emit publishedModels(modelsPublished, modelsSkipped, msgs, sendingSuccessful, directWrite);
emit this->publishedModels(modelsPublished, modelsSkipped, msgs, sendingSuccessful, directWrite);
}
else
{
const QString error = nwReply->errorString();
nwReply->close(); // close asap
const CStatusMessageList msgs( {CStatusMessage(cats, CStatusMessage::SeverityError, "HTTP error: " + error)});
emit publishedModels(CAircraftModelList(), CAircraftModelList(), msgs, false, false);
emit this->publishedModels(CAircraftModelList(), CAircraftModelList(), msgs, false, false);
}
}

7
src/blackcore/db/databasewriter.h
View File

@@ -62,10 +62,6 @@ namespace BlackCore
const BlackMisc::CStatusMessageList &messages,
bool sendingSuccessful, bool directWrite);
private slots:
//! Post response
void ps_postModelsResponse(QNetworkReply *nwReplyPtr);
private:
BlackMisc::Network::CUrlLogList m_writeLog;
BlackMisc::Network::CUrl m_modelPublishUrl;
@@ -73,6 +69,9 @@ namespace BlackCore
qint64 m_replyPendingSince = -1;
bool m_shutdown = false;
//! Post response
void postedModelsResponse(QNetworkReply *nwReplyPtr);
//! Kill the pending reply
bool killPendingReply();