completed UScriptStruct object

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -322,6 +322,7 @@ static PyMethodDef ue_PyUObject_methods[] = {
 	{ "post_edit_change", (PyCFunction)py_ue_post_edit_change, METH_VARARGS, "" },
 
 #if WITH_EDITOR
+	{ "save_config", (PyCFunction)py_ue_save_config, METH_VARARGS, "" },
 	{ "get_actor_label", (PyCFunction)py_ue_get_actor_label, METH_VARARGS, "" },
 	{ "set_actor_label", (PyCFunction)py_ue_set_actor_label, METH_VARARGS, "" },
 
@@ -1383,7 +1384,7 @@ PyObject *ue_py_convert_property(UProperty *prop, uint8 *buffer) {
 				FLinearColor color = *casted_prop->ContainerPtrToValuePtr<FLinearColor>(buffer);
 				return py_ue_new_flinearcolor(color);
 			}
-			return (PyObject *)py_ue_new_uscriptstruct(casted_struct, casted_prop->ContainerPtrToValuePtr<uint8>(buffer));
+			return py_ue_new_uscriptstruct(casted_struct, casted_prop->ContainerPtrToValuePtr<uint8>(buffer));
 		}
 		return PyErr_Format(PyExc_TypeError, "unsupported UStruct type");
 	}
@@ -1415,22 +1416,7 @@ PyObject *ue_py_convert_property(UProperty *prop, uint8 *buffer) {
 		FScriptArrayHelper_InContainer array_helper(casted_prop, buffer);
 		PyObject *py_list = PyList_New(0);
 		UProperty *array_prop = casted_prop->Inner;
-		/*if (array_prop->IsA<UStructProperty>()) {
-			uint8 *array_buffer = (uint8 *)FMemory::Malloc(array_prop->GetSize());
-			array_prop->InitializeValue(array_buffer);
-			for (int i = 0; i < array_helper.Num(); i++) {
-				array_prop->CopyCompleteValueFromScriptVM(array_buffer, array_helper.GetRawPtr(i));
-				PyObject *item = ue_py_convert_property(array_prop, array_buffer);
-				//array_prop->DestroyValue(array_buffer);
-				if (!item) {
-					Py_DECREF(py_list);
-					return NULL;
-				}
-				PyList_Append(py_list, item);
-				Py_DECREF(item);
-			}
-		}
-		else {*/
+
 		for (int i = 0; i < array_helper.Num(); i++) {
 			PyObject *item = ue_py_convert_property(array_prop, array_helper.GetRawPtr(i));
 			if (!item) {
@@ -1440,7 +1426,7 @@ PyObject *ue_py_convert_property(UProperty *prop, uint8 *buffer) {
 			PyList_Append(py_list, item);
 			Py_DECREF(item);
 		}
-		//}
+
 		return py_list;
 	}
 
@@ -1522,29 +1508,12 @@ bool ue_py_convert_pyobject(PyObject *py_obj, UProperty *prop, uint8 *buffer) {
 				helper.RemoveValues(pylist_len, helper.Num() - pylist_len);
 			}
 
-			/*if (array_prop->IsA<UStructProperty>()) {
-				for (int i = 0; i < (int)pylist_len; i++) {
-					PyObject *py_item = PyList_GetItem(py_obj, i);
-					// ensure py_item is a UScriptStruct
-					if (ue_PyUScriptStruct *u_struct = py_ue_is_uscriptstruct(py_item)) {
-						array_prop->CopySingleValue(helper.GetRawPtr(i), u_struct->data);
-					}
-					Py_DECREF(py_item);
-				}
-				return true;
-			}
-			else {*/
-
 			for (int i = 0; i < (int)pylist_len; i++) {
-				uint8 *item_buf = helper.GetRawPtr(i);
 				PyObject *py_item = PyList_GetItem(py_obj, i);
-				if (!ue_py_convert_pyobject(py_item, array_prop, item_buf)) {
-					Py_DECREF(py_item);
+				if (!ue_py_convert_pyobject(py_item, array_prop, helper.GetRawPtr(i))) {
 					return false;
 				}
-				Py_DECREF(py_item);
 			}
-			//}
 			return true;
 		}
 

Source/UnrealEnginePython/Private/UEPyObject.cpp

@@ -319,6 +319,16 @@ PyObject *py_ue_get_path_name(ue_PyUObject *self, PyObject * args) {
 	return PyUnicode_FromString(TCHAR_TO_UTF8(*(self->ue_object->GetPathName())));
 }
 
+PyObject *py_ue_save_config(ue_PyUObject *self, PyObject * args) {
+
+	ue_py_check(self);
+
+	self->ue_object->SaveConfig();
+
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
 PyObject *py_ue_set_property(ue_PyUObject *self, PyObject * args) {
 
 	ue_py_check(self);

Source/UnrealEnginePython/Private/UEPyObject.h

@@ -21,6 +21,8 @@ PyObject *py_ue_is_rooted(ue_PyUObject *, PyObject *);
 PyObject *py_ue_add_to_root(ue_PyUObject *, PyObject *);
 PyObject *py_ue_remove_from_root(ue_PyUObject *, PyObject *);
 
+PyObject *py_ue_save_config(ue_PyUObject *, PyObject *);
+
 PyObject *py_ue_get_cdo(ue_PyUObject *, PyObject *);
 PyObject *py_ue_enum_values(ue_PyUObject *, PyObject *);
 

Source/UnrealEnginePython/Private/UEPyUScriptStruct.cpp

@@ -74,13 +74,31 @@ static PyObject *ue_PyUScriptStruct_str(ue_PyUScriptStruct *self)
 		TCHAR_TO_UTF8(*self->u_struct->GetName()), self->u_struct->GetStructureSize());
 }
 
+static UProperty *get_field_from_name(UScriptStruct *u_struct, char *name) {
+	FString attr = UTF8_TO_TCHAR(name);
+	UProperty *u_property = u_struct->FindPropertyByName(FName(*attr));
+	if (u_property)
+		return u_property;
+	// if the property is not found, attempt to search for name_XXXX
+	attr += FString("_");
+	for (TFieldIterator<UProperty> prop(u_struct); prop; ++prop)
+	{
+		UProperty *property = *prop;
+		if (property->GetName().StartsWith(attr)) {
+			return property;
+		}
+	}
+
+	return nullptr;
+}
+
 static PyObject *ue_PyUScriptStruct_getattro(ue_PyUScriptStruct *self, PyObject *attr_name) {
 	PyObject *ret = PyObject_GenericGetAttr((PyObject *)self, attr_name);
 	if (!ret) {
 		if (PyUnicodeOrString_Check(attr_name)) {
 			char *attr = PyUnicode_AsUTF8(attr_name);
 			// first check for property
-			UProperty *u_property = self->u_struct->FindPropertyByName(FName(UTF8_TO_TCHAR(attr)));
+			UProperty *u_property = get_field_from_name(self->u_struct, attr);
 			if (u_property) {
 				// swallow previous exception
 				PyErr_Clear();
@@ -96,7 +114,7 @@ static int ue_PyUScriptStruct_setattro(ue_PyUScriptStruct *self, PyObject *attr_
 	if (PyUnicodeOrString_Check(attr_name)) {
 		char *attr = PyUnicode_AsUTF8(attr_name);
 		// first check for property
-		UProperty *u_property = self->u_struct->FindPropertyByName(FName(UTF8_TO_TCHAR(attr)));
+		UProperty *u_property = get_field_from_name(self->u_struct, attr);
 		if (u_property) {
 			if (ue_py_convert_pyobject(value, u_property, self->data)) {
 				return 0;
@@ -108,12 +126,21 @@ static int ue_PyUScriptStruct_setattro(ue_PyUScriptStruct *self, PyObject *attr_
 	return PyObject_GenericSetAttr((PyObject *)self, attr_name, value);
 }
 
+// destructor
+static void ue_PyUScriptStruct_dealloc(ue_PyUScriptStruct *self) {
+#if UEPY_MEMORY_DEBUG
+	UE_LOG(LogPython, Warning, TEXT("Destroying ue_PyUScriptStruct %p with size %d"), self, self->u_struct->GetStructureSize());
+#endif
+	FMemory::Free(self->data);
+	Py_TYPE(self)->tp_free((PyObject *)self);
+}
+
 static PyTypeObject ue_PyUScriptStructType = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"unreal_engine.UScriptStruct", /* tp_name */
 	sizeof(ue_PyUScriptStruct), /* tp_basicsize */
 	0,                         /* tp_itemsize */
-	0,       /* tp_dealloc */
+	(destructor)ue_PyUScriptStruct_dealloc,       /* tp_dealloc */
 	0,                         /* tp_print */
 	0,                         /* tp_getattr */
 	0,                         /* tp_setattr */