improved http support

Roberto De Ioris · Roberto De Ioris · commit 43c0ccc88268 · 2017-05-08T19:24:44.000+02:00
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.cpp b/Source/UnrealEnginePython/Private/UEPyEditor.cpp
@@ -322,6 +322,20 @@ PyObject *py_unreal_engine_import_asset(PyObject * self, PyObject * args) {
 	return Py_None;
 }
 
+
+PyObject *py_unreal_engine_editor_tick(PyObject * self, PyObject * args) {
+	float delta_seconds;
+	PyObject *py_bool;
+	if (!PyArg_ParseTuple(args, "fO:editor_tick", &delta_seconds, &py_bool)) {
+		return NULL;
+	}
+
+	GEditor->Tick(delta_seconds, PyObject_IsTrue(py_bool) ? true : false);
+
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
 PyObject *py_unreal_engine_message_dialog_open(PyObject * self, PyObject * args) {
 
 	if (!GEditor)
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.h b/Source/UnrealEnginePython/Private/UEPyEditor.h
@@ -20,6 +20,8 @@ PyObject *py_unreal_engine_get_assets_by_class(PyObject *, PyObject *);
 PyObject *py_unreal_engine_get_assets_by_filter(PyObject *, PyObject *, PyObject *);
 PyObject *py_unreal_engine_set_fbx_import_option(PyObject *, PyObject *);
 
+PyObject *py_unreal_engine_editor_tick(PyObject *, PyObject *);
+
 PyObject *py_unreal_engine_get_discovered_plugins(PyObject *, PyObject *);
 PyObject *py_unreal_engine_get_enabled_plugins(PyObject *, PyObject *);
 PyObject *py_unreal_engine_find_plugin(PyObject *, PyObject *);
diff --git a/Source/UnrealEnginePython/Private/UEPyEngine.cpp b/Source/UnrealEnginePython/Private/UEPyEngine.cpp
@@ -317,7 +317,19 @@ PyObject *py_unreal_engine_string_to_guid(PyObject * self, PyObject * args) {
 	}
 
 	return PyErr_Format(PyExc_Exception, "unable to build FGuid");
+}
+
+PyObject *py_unreal_engine_engine_tick(PyObject * self, PyObject * args) {
+	float delta_seconds;
+	PyObject *py_bool;
+	if (!PyArg_ParseTuple(args, "fO:engine_tick", &delta_seconds, &py_bool)) {
+		return NULL;
+	}
 
+	GEngine->Tick(delta_seconds, PyObject_IsTrue(py_bool) ? true : false);
+
+	Py_INCREF(Py_None);
+	return Py_None;
 }
 
 
diff --git a/Source/UnrealEnginePython/Private/UEPyEngine.h b/Source/UnrealEnginePython/Private/UEPyEngine.h
@@ -27,6 +27,8 @@ PyObject *py_unreal_engine_load_enum(PyObject *, PyObject *);
 
 PyObject *py_unreal_engine_string_to_guid(PyObject *, PyObject *);
 
+PyObject *py_unreal_engine_engine_tick(PyObject *, PyObject *);
+
 PyObject *py_unreal_engine_find_object(PyObject *, PyObject *);
 
 PyObject *py_unreal_engine_all_classes(PyObject *, PyObject *);
diff --git a/Source/UnrealEnginePython/Private/UEPyIHttpBase.cpp b/Source/UnrealEnginePython/Private/UEPyIHttpBase.cpp
@@ -42,7 +42,6 @@ static PyObject *py_ue_ihttp_base_get_url_parameter(ue_PyIHttpBase *self, PyObje
 static PyObject *py_ue_ihttp_base_get_all_headers(ue_PyIHttpBase *self, PyObject * args) {
 	TArray<FString> headers = self->http_base->GetAllHeaders();
 	PyObject *py_headers = PyList_New(0);
-	return PyUnicode_FromString(TCHAR_TO_UTF8(*self->http_base->GetContentType()));
 	for (FString item : headers) {
 		PyObject *py_header = PyUnicode_FromString(TCHAR_TO_UTF8(*item));
 		PyList_Append(py_headers, py_header);
@@ -65,13 +64,8 @@ static PyMethodDef ue_PyIHttpBase_methods[] = {
 
 static PyObject *ue_PyIHttpBase_str(ue_PyIHttpBase *self)
 {
-	char *s = (char*)"";
-	FString url = self->http_base->GetURL();
-	if (!url.IsEmpty()) {
-		s = TCHAR_TO_UTF8(*url);
-	}
-	return PyUnicode_FromFormat("<unreal_engine.IHttpBase {'url': '%s'}>",
-		PyUnicode_FromString(s));
+	return PyUnicode_FromFormat("<unreal_engine.IHttpBase '%p'>",
+		self->http_base);
 }
 
 PyTypeObject ue_PyIHttpBaseType = {
diff --git a/Source/UnrealEnginePython/Private/UEPyIHttpBase.h b/Source/UnrealEnginePython/Private/UEPyIHttpBase.h
@@ -7,7 +7,7 @@
 typedef struct {
 	PyObject_HEAD
 	/* Type-specific fields go here. */
-	TSharedRef<IHttpBase> http_base;
+	IHttpBase *http_base;
 } ue_PyIHttpBase;
 
 
diff --git a/Source/UnrealEnginePython/Private/UEPyIHttpRequest.cpp b/Source/UnrealEnginePython/Private/UEPyIHttpRequest.cpp
@@ -1,6 +1,8 @@
 
 #include "UnrealEnginePythonPrivatePCH.h"
 
+#include "Runtime/Online/HTTP/Public/HttpManager.h"
+
 static PyObject *py_ue_ihttp_request_set_verb(ue_PyIHttpRequest *self, PyObject * args) {
 
 	char *verb;
@@ -85,6 +87,8 @@ static PyObject *py_ue_ihttp_request_tick(ue_PyIHttpRequest *self, PyObject * ar
 		return NULL;
 	}
 
+	FHttpModule::Get().GetHttpManager().Tick(delta_seconds);
+
 	self->http_request->Tick(delta_seconds);
 
 	Py_INCREF(Py_None);
@@ -122,7 +126,7 @@ static PyObject *py_ue_ihttp_request_get_response(ue_PyIHttpRequest *self, PyObj
 	if (!response.IsValid()) {
 		return PyErr_Format(PyExc_Exception, "unable to retrieve IHttpResponse");
 	}
-	return py_ue_new_ihttp_response(response);
+	return py_ue_new_ihttp_response(response.Get());
 }
 
 static PyMethodDef ue_PyIHttpRequest_methods[] = {
@@ -145,13 +149,8 @@ static PyMethodDef ue_PyIHttpRequest_methods[] = {
 
 static PyObject *ue_PyIHttpRequest_str(ue_PyIHttpRequest *self)
 {
-	char *s = (char*)"";
-	FString url = self->http_request->GetURL();
-	if (!url.IsEmpty()) {
-		s = TCHAR_TO_UTF8(*url);
-	}
-	return PyUnicode_FromFormat("<unreal_engine.IHttpRequest {'url': '%s'}>",
-		PyUnicode_FromString(s));
+	return PyUnicode_FromFormat("<unreal_engine.IHttpRequest '%p'>",
+		self->http_request.Get());
 }
 
 static PyTypeObject ue_PyIHttpRequestType = {
@@ -203,7 +202,7 @@ static int ue_py_ihttp_request_init(ue_PyIHttpRequest *self, PyObject *args, PyO
 		self->http_request->SetURL(UTF8_TO_TCHAR(url));
 	}
 
-	self->base.http_base = self->http_request;
+	self->base.http_base = &self->http_request.Get();
 	return 0;
 }
 
diff --git a/Source/UnrealEnginePython/Private/UEPyIHttpRequest.h b/Source/UnrealEnginePython/Private/UEPyIHttpRequest.h
@@ -5,6 +5,7 @@
 #include "Runtime/Online/HTTP/Public/Interfaces/IHttpRequest.h"
 #include "Runtime/Online/HTTP/Public/HttpModule.h"
 
+
 struct ue_PyIHttpBaseType;
 
 typedef struct {
diff --git a/Source/UnrealEnginePython/Private/UEPyIHttpResponse.cpp b/Source/UnrealEnginePython/Private/UEPyIHttpResponse.cpp
@@ -20,13 +20,8 @@ static PyMethodDef ue_PyIHttpResponse_methods[] = {
 
 static PyObject *ue_PyIHttpResponse_str(ue_PyIHttpResponse *self)
 {
-	char *s = (char*)"";
-	FString url = self->http_response->GetURL();
-	if (!url.IsEmpty()) {
-		s = TCHAR_TO_UTF8(*url);
-	}
-	return PyUnicode_FromFormat("<unreal_engine.IHttpResponse {'url': '%s'}>",
-		PyUnicode_FromString(s));
+	return PyUnicode_FromFormat("<unreal_engine.IHttpResponse '%p'>",
+		self->http_response);
 }
 
 static PyTypeObject ue_PyIHttpResponseType = {
@@ -74,10 +69,10 @@ void ue_python_init_ihttp_response(PyObject *ue_module) {
 	PyModule_AddObject(ue_module, "IHttpResponse", (PyObject *)&ue_PyIHttpResponseType);
 }
 
-PyObject *py_ue_new_ihttp_response(FHttpResponsePtr response) {
+PyObject *py_ue_new_ihttp_response(IHttpResponse *response) {
 	ue_PyIHttpResponse *ret = (ue_PyIHttpResponse *)PyObject_New(ue_PyIHttpResponse, &ue_PyIHttpResponseType);
 	ret->http_response = response;
-	TSharedRef<IHttpBase> ref(response.Get());
-	ret->base.http_base = ref;
+	//TSharedRef<IHttpBase> ref(response);
+	//ret->base.http_base = ref;
 	return (PyObject *)ret;
 }
diff --git a/Source/UnrealEnginePython/Private/UEPyIHttpResponse.h b/Source/UnrealEnginePython/Private/UEPyIHttpResponse.h
@@ -10,9 +10,9 @@ struct ue_PyIHttpBaseType;
 typedef struct {
 	ue_PyIHttpBase base;
 	/* Type-specific fields go here. */
-	FHttpResponsePtr http_response;
+	IHttpResponse *http_response;
 } ue_PyIHttpResponse;
 
 
 void ue_python_init_ihttp_response(PyObject *);
-PyObject *py_ue_new_ihttp_response(FHttpResponsePtr);
+PyObject *py_ue_new_ihttp_response(IHttpResponse *);
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -229,8 +229,12 @@ static PyMethodDef unreal_engine_methods[] = {
 
 	{ "editor_undo", py_unreal_engine_editor_undo, METH_VARARGS, "" },
 	{ "editor_redo", py_unreal_engine_editor_redo, METH_VARARGS, "" },
+
+	{ "editor_tick", py_unreal_engine_editor_tick, METH_VARARGS, "" },
 #endif
 
+	{ "engine_tick", py_unreal_engine_engine_tick, METH_VARARGS, "" },
+
 	{ "new_object", py_unreal_engine_new_object, METH_VARARGS, "" },
 
 
diff --git a/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp b/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp
@@ -62,6 +62,7 @@ bool FUnrealEnginePythonModule::PythonGILAcquire() {
 }
 
 static void UESetupPythonInterpreter(bool verbose) {
+
 #if PY_MAJOR_VERSION >= 3
 	wchar_t *argv[] = { UTF8_TO_TCHAR("UnrealEngine"), NULL };
 #else
@@ -90,6 +91,22 @@ static void UESetupPythonInterpreter(bool verbose) {
 	}
 }
 
+static void setup_stdout_stderr() {
+	// Redirecting stdout
+	char const* code = "import sys\n"
+		"import unreal_engine as ue\n"
+		"class UnrealEngineOutput:\n"
+		"    def __init__(self, logger):\n"
+		"        self.logger = logger\n"
+		"    def write(self, buf):\n"
+		"        self.logger(buf)\n"
+		"    def flush(self):\n"
+		"        return\n"
+		"sys.stdout = UnrealEngineOutput(ue.log)\n"
+		"sys.stderr = UnrealEngineOutput(ue.log_error)\n";
+	PyRun_SimpleString(code);
+}
+
 void FUnrealEnginePythonModule::StartupModule()
 {
 	// This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module
@@ -114,19 +131,7 @@ void FUnrealEnginePythonModule::StartupModule()
 	main_dict = PyModule_GetDict((PyObject*)main_module);
 	local_dict = main_dict;// PyDict_New();
 
-	// Redirecting stdout
-	char const* code = "import sys\n"
-		"import unreal_engine as ue\n"
-		"class UnrealEngineOutput:\n"
-		"    def __init__(self, logger):\n"
-		"        self.logger = logger\n"
-		"    def write(self, buf):\n"
-		"        self.logger(buf)\n"
-		"    def flush(self):\n"
-		"        return\n"
-		"sys.stdout = UnrealEngineOutput(ue.log)\n"
-		"sys.stderr = UnrealEngineOutput(ue.log_error)\n";
-	PyRun_SimpleString(code);
+	setup_stdout_stderr();
 
 	if (PyImport_ImportModule("ue_site")) {
 		UE_LOG(LogPython, Log, TEXT("ue_site Python module successfully imported"));
@@ -184,6 +189,8 @@ void FUnrealEnginePythonModule::RunStringSandboxed(char *str) {
 
 	UESetupPythonInterpreter(false);
 
+	setup_stdout_stderr();
+
 	PyObject *m = PyImport_AddModule("__main__");
 	if (m == NULL) {
 		UE_LOG(LogPython, Error, TEXT("Unable to create new global dict"));
@@ -268,6 +275,8 @@ void FUnrealEnginePythonModule::RunFileSandboxed(char *filename) {
 
 	UESetupPythonInterpreter(false);
 
+	setup_stdout_stderr();
+
 	PyObject *m = PyImport_AddModule("__main__");
 	if (m == NULL) {
 		UE_LOG(LogPython, Error, TEXT("Unable to create new global dict"));

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`
`2`	`2`	`#include "UnrealEnginePythonPrivatePCH.h"`
`3`	`3`
	`4`	`+#include "Runtime/Online/HTTP/Public/HttpManager.h"`
	`5`	`+`
`4`	`6`	`static PyObject py_ue_ihttp_request_set_verb(ue_PyIHttpRequest self, PyObject * args) {`
`5`	`7`
`6`	`8`	`char *verb;`
`@@ -85,6 +87,8 @@ static PyObject py_ue_ihttp_request_tick(ue_PyIHttpRequest self, PyObject * ar`
`85`	`87`	`return NULL;`
`86`	`88`	`}`
`87`	`89`
	`90`	`+ FHttpModule::Get().GetHttpManager().Tick(delta_seconds);`
	`91`	`+`
`88`	`92`	`self->http_request->Tick(delta_seconds);`
`89`	`93`
`90`	`94`	`Py_INCREF(Py_None);`
`@@ -122,7 +126,7 @@ static PyObject py_ue_ihttp_request_get_response(ue_PyIHttpRequest self, PyObj`
`122`	`126`	`if (!response.IsValid()) {`
`123`	`127`	`return PyErr_Format(PyExc_Exception, "unable to retrieve IHttpResponse");`
`124`	`128`	`}`
`125`		`- return py_ue_new_ihttp_response(response);`
	`129`	`+ return py_ue_new_ihttp_response(response.Get());`
`126`	`130`	`}`
`127`	`131`
`128`	`132`	`static PyMethodDef ue_PyIHttpRequest_methods[] = {`
`@@ -145,13 +149,8 @@ static PyMethodDef ue_PyIHttpRequest_methods[] = {`
`145`	`149`
`146`	`150`	`static PyObject ue_PyIHttpRequest_str(ue_PyIHttpRequest self)`
`147`	`151`	`{`
`148`		`- char s = (char)"";`
`149`		`- FString url = self->http_request->GetURL();`
`150`		`- if (!url.IsEmpty()) {`
`151`		`- s = TCHAR_TO_UTF8(*url);`
`152`		`- }`
`153`		`- return PyUnicode_FromFormat("<unreal_engine.IHttpRequest {'url': '%s'}>",`
`154`		`- PyUnicode_FromString(s));`
	`152`	`+ return PyUnicode_FromFormat("<unreal_engine.IHttpRequest '%p'>",`
	`153`	`+ self->http_request.Get());`
`155`	`154`	`}`
`156`	`155`
`157`	`156`	`static PyTypeObject ue_PyIHttpRequestType = {`
`@@ -203,7 +202,7 @@ static int ue_py_ihttp_request_init(ue_PyIHttpRequest self, PyObject args, PyO`
`203`	`202`	`self->http_request->SetURL(UTF8_TO_TCHAR(url));`
`204`	`203`	`}`
`205`	`204`
`206`		`- self->base.http_base = self->http_request;`
	`205`	`+ self->base.http_base = &self->http_request.Get();`
`207`	`206`	`return 0;`
`208`	`207`	`}`
`209`	`208`