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

refs #527, changed writer to be able to publish multiple models at once

Browse Source
This commit is contained in:
Klaus Basan
2016-01-02 21:03:48 +01:00
parent 5ab0173508
commit 0a6ed4e874
2 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/blackcore/databasewriter.cpp
View File

@@ -8,6 +8,7 @@
*/ */
#include "databasewriter.h" #include "databasewriter.h"
#include "blackcore/cookiemanager.h"
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
#include "blackmisc/datastoreutility.h" #include "blackmisc/datastoreutility.h"
#include "blackmisc/network/networkutils.h" #include "blackmisc/network/networkutils.h"
@@ -25,36 +26,40 @@ namespace BlackCore
{ {
CDatabaseWriter::CDatabaseWriter(const Network::CUrl &baseUrl, QObject *parent) : CDatabaseWriter::CDatabaseWriter(const Network::CUrl &baseUrl, QObject *parent) :
QObject(parent), QObject(parent),
m_modelUrl(getModelWriteUrl(baseUrl)) m_modelPublishUrl(getModelPublishUrl(baseUrl))
{ {
this->m_networkManager = new QNetworkAccessManager(this); this->m_networkManager = new QNetworkAccessManager(this);
CCookieManager::setToAccessManager(this->m_networkManager);
this->connect(this->m_networkManager, &QNetworkAccessManager::finished, this, &CDatabaseWriter::ps_postResponse); this->connect(this->m_networkManager, &QNetworkAccessManager::finished, this, &CDatabaseWriter::ps_postResponse);
} }
CStatusMessageList CDatabaseWriter::asyncWriteModel(const CAircraftModel &model) CStatusMessageList CDatabaseWriter::asyncPublishModels(const CAircraftModelList &models)
{ {
CStatusMessageList msg; CStatusMessageList msgs;
if (m_shutdown) if (m_shutdown)
{ {
msg.push_back(CStatusMessage(CStatusMessage::SeverityWarning, "Database writer shuts down")); msgs.push_back(CStatusMessage(CStatusMessage::SeverityWarning, "Database writer shuts down"));
return msg; return msgs;
} }
if (m_pendingReply) if (m_pendingReply)
{ {
msg.push_back(CStatusMessage(CStatusMessage::SeverityWarning, "Another write operation in progress")); msgs.push_back(CStatusMessage(CStatusMessage::SeverityWarning, "Another write operation in progress"));
return msg; return msgs;
} }
QUrl url(m_modelUrl.toQUrl()); QUrl url(m_modelPublishUrl.toQUrl());
QNetworkRequest request(url); QNetworkRequest request(url);
QHttpMultiPart *multiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType, this); QHttpMultiPart *multiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType, this);
multiPart->append(CNetworkUtils::getJsonTextMutlipart(model.toJson())); multiPart->append(CNetworkUtils::getJsonTextMultipart(models.toDatabaseJson()));
if (m_setup.get().dbDebugFlag()) { multiPart->append(CNetworkUtils::getMultipartWithDebugFlag()); } if (m_setup.get().dbDebugFlag())
{
multiPart->append(CNetworkUtils::getMultipartWithDebugFlag());
}
m_pendingReply = this->m_networkManager->post(request, multiPart); m_pendingReply = this->m_networkManager->post(request, multiPart);
multiPart->setParent(m_pendingReply); multiPart->setParent(m_pendingReply);
return msg; return msgs;
} }
void CDatabaseWriter::gracefulShutdown() void CDatabaseWriter::gracefulShutdown()
@@ -69,8 +74,11 @@ namespace BlackCore
void CDatabaseWriter::ps_postResponse(QNetworkReply *nwReplyPtr) void CDatabaseWriter::ps_postResponse(QNetworkReply *nwReplyPtr)
{ {
static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::swiftDbWebservice()}));
QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr); QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
m_pendingReply = nullptr; m_pendingReply = nullptr;
QUrl url(nwReply->url());
QString urlString(url.toString());
if (m_shutdown) if (m_shutdown)
{ {
@@ -82,30 +90,32 @@ namespace BlackCore
{ {
const QString dataFileData(nwReply->readAll().trimmed()); const QString dataFileData(nwReply->readAll().trimmed());
nwReply->close(); // close asap nwReply->close(); // close asap
if (dataFileData.isEmpty()) if (dataFileData.isEmpty())
{ {
CLogMessage(this).error("No response data"); const CStatusMessageList msgs({CStatusMessage(cats, CStatusMessage::SeverityError, "No response data from " + urlString)});
emit published(CAircraftModelList(), CAircraftModelList(), msgs);
return; return;
} }
CAircraftModelList modelsPublished;
CAircraftModelList modelsSkipped;
CStatusMessageList msgs; CStatusMessageList msgs;
CVariant id; bool success = CDatastoreUtility::parseSwiftPublishResponse(dataFileData, modelsPublished, modelsSkipped, msgs);
bool success = CDatastoreUtility::parseSwiftWriteResponse(dataFileData, msgs, id); emit published(modelsPublished, modelsSkipped, msgs);
CLogMessage(this).preformatted(msgs);
Q_UNUSED(success); Q_UNUSED(success);
} }
else else
{ {
QString error = nwReply->errorString(); QString error = nwReply->errorString();
nwReply->close(); // close asap nwReply->close(); // close asap
CLogMessage(this).error(error); const CStatusMessageList msgs( {CStatusMessage(cats, CStatusMessage::SeverityError, "HTTP error: " + error)});
emit published(CAircraftModelList(), CAircraftModelList(), msgs);
} }
} }
Network::CUrl CDatabaseWriter::getModelWriteUrl(const Network::CUrl &baseUrl) CUrl CDatabaseWriter::getModelPublishUrl(const Network::CUrl &baseUrl)
{ {
return baseUrl.withAppendedPath("service/swiftwritemodel.php"); return baseUrl.withAppendedPath("service/publishmodels.php");
} }
QList<QByteArray> CDatabaseWriter::splitData(const QByteArray &data, int size) QList<QByteArray> CDatabaseWriter::splitData(const QByteArray &data, int size)
@@ -121,5 +131,4 @@ namespace BlackCore
} }
return arrays; return arrays;
} }
} // namespace } // namespace

12
src/blackcore/databasewriter.h
View File

@@ -15,7 +15,7 @@
#include "blackcore/blackcoreexport.h" #include "blackcore/blackcoreexport.h"
#include "blackcore/data/globalsetup.h" #include "blackcore/data/globalsetup.h"
#include "blackmisc/threadedreader.h" #include "blackmisc/threadedreader.h"
#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodellist.h"
#include <QNetworkReply> #include <QNetworkReply>
#include <QJsonArray> #include <QJsonArray>
@@ -33,24 +33,28 @@ namespace BlackCore
CDatabaseWriter(const BlackMisc::Network::CUrl &baseUrl, QObject *parent); CDatabaseWriter(const BlackMisc::Network::CUrl &baseUrl, QObject *parent);
//! Write model to DB //! Write model to DB
BlackMisc::CStatusMessageList asyncWriteModel(const BlackMisc::Simulation::CAircraftModel &model); BlackMisc::CStatusMessageList asyncPublishModels(const BlackMisc::Simulation::CAircraftModelList &models);
//! Shutdown //! Shutdown
void gracefulShutdown(); void gracefulShutdown();
signals:
//! Published models, the response to \sa asyncPublishModels
void published(const BlackMisc::Simulation::CAircraftModelList &modelsPublished, const BlackMisc::Simulation::CAircraftModelList &modelsSkipped, const BlackMisc::CStatusMessageList &messages);
private slots: private slots:
//! Post response //! Post response
void ps_postResponse(QNetworkReply *nwReplyPtr); void ps_postResponse(QNetworkReply *nwReplyPtr);
private: private:
BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< data cache BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< data cache
BlackMisc::Network::CUrl m_modelUrl; BlackMisc::Network::CUrl m_modelPublishUrl;
QNetworkAccessManager *m_networkManager = nullptr; QNetworkAccessManager *m_networkManager = nullptr;
QNetworkReply *m_pendingReply = nullptr; QNetworkReply *m_pendingReply = nullptr;
bool m_shutdown = false; bool m_shutdown = false;
//! URL model web service //! URL model web service
static BlackMisc::Network::CUrl getModelWriteUrl(const BlackMisc::Network::CUrl &baseUrl); static BlackMisc::Network::CUrl getModelPublishUrl(const BlackMisc::Network::CUrl &baseUrl);
//! Split data array //! Split data array
static QList<QByteArray> splitData(const QByteArray &data, int size); static QList<QByteArray> splitData(const QByteArray &data, int size);