Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update EntityScriptClient to receive more status information

Browse source
This commit is contained in:
Ryan Huffman 2017-01-19 13:26:24 -08:00
parent cbb55a06a0
commit fa28933464
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libraries/networking/src/EntityScriptClient.cpp
View file

@ -1,6 +1,7 @@
#include "EntityScriptClient.h"
#include "NodeList.h"
#include "NetworkLogging.h"
#include "EntityScriptUtils.h"
#include <QThread>
@ -15,9 +16,12 @@ GetScriptStatusRequest::~GetScriptStatusRequest() {
void GetScriptStatusRequest::start() {
auto client = DependencyManager::get<EntityScriptClient>();
qDebug() << "Sending script status request";
client->getEntityServerScriptStatus(_entityID, [this](bool responseReceived) {
qDebug() << "Received script status request";
client->getEntityServerScriptStatus(_entityID, [this](bool responseReceived, bool isRunning, EntityScriptStatus status, QString errorInfo) {
this->responseReceived = responseReceived;
this->isRunning = isRunning;
this->status = status;
this->errorInfo = errorInfo;
emit finished(this);
});
}
@ -84,7 +88,7 @@ MessageID EntityScriptClient::getEntityServerScriptStatus(QUuid entityID, GetScr
}
}
callback(false);
callback(false, false, ERROR_LOADING_SCRIPT, "");
return INVALID_MESSAGE_ID;
}
@ -92,9 +96,17 @@ void EntityScriptClient::handleGetScriptStatusReply(QSharedPointer<ReceivedMessa
Q_ASSERT(QThread::currentThread() == thread());
MessageID messageID;
message->readPrimitive(&messageID);
bool isKnown { false };
EntityScriptStatus status = ERROR_LOADING_SCRIPT;
QString errorInfo { "" };
auto status = message->readString();
message->readPrimitive(&messageID);
message->readPrimitive(&isKnown);
if (isKnown) {
message->readPrimitive(&status);
errorInfo = message->readString();
}
// Check if we have any pending requests for this node
auto messageMapIt = _pendingEntityScriptStatusRequests.find(senderNode);
@ -107,7 +119,7 @@ void EntityScriptClient::handleGetScriptStatusReply(QSharedPointer<ReceivedMessa
auto requestIt = messageCallbackMap.find(messageID);
if (requestIt != messageCallbackMap.end()) {
auto callback = requestIt->second;
callback(true);
callback(true, isKnown, status, errorInfo);
messageCallbackMap.erase(requestIt);
}
@ -145,7 +157,7 @@ void EntityScriptClient::forceFailureOfPendingRequests(SharedNodePointer node) {
auto messageMapIt = _pendingEntityScriptStatusRequests.find(node);
if (messageMapIt != _pendingEntityScriptStatusRequests.end()) {
for (const auto& value : messageMapIt->second) {
value.second(false);
value.second(false, false, ERROR_LOADING_SCRIPT, "");
}
messageMapIt->second.clear();
}

10
libraries/networking/src/EntityScriptClient.h
View file

@ -15,14 +15,14 @@
#include "LimitedNodeList.h"
#include "ReceivedMessage.h"
#include "AssetUtils.h"
#include "EntityScriptUtils.h"
#include <DependencyManager.h>
#include <cstdint>
#include <unordered_map>
using MessageID = uint32_t;
using GetScriptStatusCallback = std::function<void(bool responseReceived)>;
using GetScriptStatusCallback = std::function<void(bool responseReceived, bool isRunning, EntityScriptStatus status, QString errorInfo)>;
class GetScriptStatusRequest : public QObject {
Q_OBJECT
@ -32,13 +32,17 @@ public:
Q_INVOKABLE void start();
bool responseReceived;
bool isRunning;
EntityScriptStatus status;
QString errorInfo;
signals:
void finished(GetScriptStatusRequest* request);
private:
QUuid _entityID;
MessageID _messageID;
QString status;
};
class EntityScriptClient : public QObject, public Dependency {