Update Entities.getServerScriptStatus to return more information

Ryan Huffman committed 9 years ago

Commit d45f5ad1 parent fa289331 file · +16 −1Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

@@ -680,7 +680,22 @@ bool EntityScriptingInterface::getServerScriptStatus(QUuid entityID, QScriptValu · 679 unmodified lines
680	auto client = DependencyManager::get<EntityScriptClient>();	680	auto client = DependencyManager::get<EntityScriptClient>();
681	auto request = client->createScriptStatusRequest(entityID);	681	auto request = client->createScriptStatusRequest(entityID);
682	connect(request, &GetScriptStatusRequest::finished, callback.engine(), [callback](GetScriptStatusRequest* request) mutable {	682	connect(request, &GetScriptStatusRequest::finished, callback.engine(), [callback](GetScriptStatusRequest* request) mutable {
683	QScriptValueList args { true };	683	QString statusString;
		684	switch (request->status) {
		685	case RUNNING:
		686	statusString = "running";
		687	break;
		688	case ERROR_LOADING_SCRIPT:
		689	statusString = "error_loading_script";
		690	break;
		691	case ERROR_RUNNING_SCRIPT:
		692	statusString = "error_running_script";
		693	break;
		694	default:
		695	statusString = "";
		696	break;
		697	}
		698	QScriptValueList args { request->responseReceived, request->isRunning, statusString, request->errorInfo };
684	callback.call(QScriptValue(), args);	699	callback.call(QScriptValue(), args);
685	request->deleteLater();	700	request->deleteLater();
686	});	701	});