added directories support to the python editor

Author: Roberto De Ioris

Source/PythonEditor/Private/PythonEditorStyle.cpp

@@ -47,6 +47,7 @@ void FPythonEditorStyle::Initialize()
 		StyleSet->Set("PythonEditor.TabIcon", new IMAGE_BRUSH("UI/PythonEditor_16x", Icon16x16));
 
 		StyleSet->Set("PythonEditor.New", new IMAGE_BRUSH("UI/GenericFile", Icon40x40));
+		StyleSet->Set("PythonEditor.NewDirectory", new IMAGE_BRUSH("UI/GenericFile", Icon40x40));
 		StyleSet->Set("PythonEditor.New.Small", new IMAGE_BRUSH("UI/GenericFile", Icon16x16));
 		StyleSet->Set("PythonEditor.Delete", new IMAGE_BRUSH("UI/DeleteFile", Icon40x40));
 		StyleSet->Set("PythonEditor.Delete.Small", new IMAGE_BRUSH("UI/DeleteFile", Icon16x16));

Source/PythonEditor/Private/PythonProjectEditor.cpp

@@ -221,6 +221,10 @@ void FPythonProjectEditor::BindCommands()
 		FExecuteAction::CreateSP(this, &FPythonProjectEditor::New_Internal),
 		FCanExecuteAction::CreateSP(this, &FPythonProjectEditor::CanNew)
 		);
+	ToolkitCommands->MapAction(FPythonProjectEditorCommands::Get().NewDirectory,
+		FExecuteAction::CreateSP(this, &FPythonProjectEditor::NewDirectory_Internal),
+		FCanExecuteAction::CreateSP(this, &FPythonProjectEditor::CanNew)
+		);
 	ToolkitCommands->MapAction(FPythonProjectEditorCommands::Get().Delete,
 		FExecuteAction::CreateSP(this, &FPythonProjectEditor::Delete_Internal),
 		FCanExecuteAction::CreateSP(this, &FPythonProjectEditor::CanDelete)
@@ -299,24 +303,41 @@ TSharedRef<SWidget> FPythonProjectEditor::CreatePythonEditorWidget(TSharedRef<FT
 	return SNew(SPythonEditor, Item);
 }
 
-FString FPythonProjectEditor::GetNoneRepeatName()
+FString FPythonProjectEditor::GetSafeName(bool IsDirectory)
 {
 	UPythonProject* PythonProject = PythonProjectBeingEdited.Get();
 
+	TArray<UPythonProjectItem*> selItems = MyPythonProjectEditor->GetSelectedItems();
+	FString basePath = PythonProject->Path;
+	if (selItems.Num() > 0) {
+		if (selItems[0]->Type == EPythonProjectItemType::Folder) {
+			basePath = selItems[0]->Path;
+		}
+	}
+
 	int suf = 2;
 	FString scriptName;
 	while (true)
 	{
 
 		FString SufStr = FString::Printf(TEXT("%d"), suf);
-		scriptName = PythonProject->Path / TEXT("PythonScript") + SufStr + TEXT(".py");
-		if (!FPaths::FileExists(scriptName)) {
-			return scriptName;
+		if (!IsDirectory) {
+			scriptName = basePath / TEXT("PythonScript") + SufStr + TEXT(".py");
+			if (!FPaths::FileExists(scriptName)) {
+				return scriptName;
+			}
+		}
+		else {
+			scriptName = basePath / TEXT("NewDirectory") + SufStr;
+			if (!FPaths::DirectoryExists(scriptName)) {
+				return scriptName;
+			}
 		}
 
 		suf++;
 	}
 }
+
 void FPythonProjectEditor::New_Internal()
 {
 	New();
@@ -326,7 +347,7 @@ bool FPythonProjectEditor::New()
 {
 	IPlatformFile& PlatformFile = FPlatformFileManager::Get().GetPlatformFile();
 
-	FString scriptName = GetNoneRepeatName();
+	FString scriptName = GetSafeName(false);
 	IFileHandle* fileHandle = PlatformFile.OpenWrite(*scriptName);
 	if (fileHandle == NULL) {
 		return false;
@@ -335,7 +356,26 @@ bool FPythonProjectEditor::New()
 	UPythonProject* PythonProject = PythonProjectBeingEdited.Get();
 	PythonProject->RescanChildren();
 	UPythonProjectItem* item = MyPythonProjectEditor->SelectByPath(scriptName);
-	OpenFileForEditing(item);
+	if (item)
+		OpenFileForEditing(item);
+	return true;
+}
+
+void FPythonProjectEditor::NewDirectory_Internal()
+{
+	NewDirectory();
+}
+
+bool FPythonProjectEditor::NewDirectory()
+{
+	IPlatformFile& PlatformFile = FPlatformFileManager::Get().GetPlatformFile();
+
+	FString dirName = GetSafeName(true);
+	if (!PlatformFile.CreateDirectory(*dirName)) {
+		return false;
+	}
+	UPythonProject* PythonProject = PythonProjectBeingEdited.Get();
+	PythonProject->RescanChildren();
 	return true;
 }
 

Source/PythonEditor/Private/PythonProjectEditor.h

@@ -51,6 +51,8 @@ class FPythonProjectEditor : public FWorkflowCentricApplication, public FGCObjec
 	TSharedPtr<class FPythonProjectEditorToolbar> GetToolbarBuilder() { return ToolbarBuilder; }
 	bool New();
 
+	bool NewDirectory();
+
 	bool Delete();
 
 	bool Save();
@@ -61,13 +63,15 @@ class FPythonProjectEditor : public FWorkflowCentricApplication, public FGCObjec
 
 	bool ExecuteInSandbox();
 
-	FString GetNoneRepeatName();
+	FString GetSafeName(bool IsDirectory);
 
 private:
 	void BindCommands();
 
 	void New_Internal();
 
+	void NewDirectory_Internal();
+
 	void Delete_Internal();
 
 	void Save_Internal();

Source/PythonEditor/Private/PythonProjectEditorCommands.cpp

@@ -15,6 +15,7 @@ FPythonProjectEditorCommands::FPythonProjectEditorCommands()
 void FPythonProjectEditorCommands::RegisterCommands()
 {
 	UI_COMMAND(New, "New", "New Python Script.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control, EKeys::N));
+	UI_COMMAND(NewDirectory, "New Directory", "New Directory.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control | EModifierKey::Shift, EKeys::N));
 	UI_COMMAND(Delete, "Delete", "Delete Python Script.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control, EKeys::D));
 
 	UI_COMMAND(Save, "Save", "Save the currently active document.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control, EKeys::S));

Source/PythonEditor/Private/PythonProjectEditorCommands.h

@@ -10,6 +10,7 @@ class FPythonProjectEditorCommands : public TCommands<FPythonProjectEditorComman
 	FPythonProjectEditorCommands();
 
 	TSharedPtr<FUICommandInfo> New;
+	TSharedPtr<FUICommandInfo> NewDirectory;
 	TSharedPtr<FUICommandInfo> Delete;
 	TSharedPtr<FUICommandInfo> Save;
 	TSharedPtr<FUICommandInfo> SaveAll;

Source/PythonEditor/Private/PythonProjectEditorToolbar.cpp

@@ -26,6 +26,7 @@ void FPythonProjectEditorToolbar::FillEditorToolbar(FToolBarBuilder& ToolbarBuil
 	ToolbarBuilder.BeginSection(TEXT("FileManagement"));
 	{
 		ToolbarBuilder.AddToolBarButton(FPythonProjectEditorCommands::Get().New);
+		ToolbarBuilder.AddToolBarButton(FPythonProjectEditorCommands::Get().NewDirectory);
 		ToolbarBuilder.AddToolBarButton(FPythonProjectEditorCommands::Get().Delete);
 		ToolbarBuilder.AddToolBarButton(FPythonProjectEditorCommands::Get().Save);
 		ToolbarBuilder.AddToolBarButton(FPythonProjectEditorCommands::Get().SaveAll);

Source/PythonEditor/Private/SPythonProjectEditor.cpp

@@ -107,9 +107,10 @@ TArray<UPythonProjectItem*> SPythonProjectEditor::GetSelectedItems()
 
 void SPythonProjectEditor::FolderNameChanged(UPythonProjectItem* Item)
 {
-
-	FPythonProjectEditor::Get()->CloseFileForEditing(Item);
-	FPythonProjectEditor::Get()->OpenFileForEditing(Item);
+	if (Item->Type == EPythonProjectItemType::File) {
+		FPythonProjectEditor::Get()->CloseFileForEditing(Item);
+		FPythonProjectEditor::Get()->OpenFileForEditing(Item);
+	}
 }
 bool SPythonProjectEditor::IsTreeItemSelected(UPythonProjectItem* Item) const
 {

Source/UnrealEnginePython/Private/UnrealEnginePython.cpp

@@ -104,7 +104,17 @@ void FUnrealEnginePythonModule::StartupModule()
 	local_dict = main_dict;// PyDict_New();
 
 	// Redirecting stdout
-	char const* code = "import sys\r\nclass StdoutCatcher :\r\n\tdef __init__(self) :\r\n\t\tself.data = ''\r\n\tdef flush(self) :\r\n\t\tself.data = ''\r\n\tdef write(self, stuff) :\r\n\t\tif(stuff.strip()!=''):\r\n\t\t\tself.data = self.data+'python: '+ stuff\r\ncatcher = StdoutCatcher()\r\nsys.stdout = catcher";
+	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);
 
 	if (PyImport_ImportModule("ue_site")) {
@@ -144,18 +154,6 @@ void FUnrealEnginePythonModule::RunString(char *str) {
 		unreal_engine_py_log_error();
 		return;
 	}
-	else {
-		//Get stdout output information
-		PyObject* catcher = PyObject_GetAttrString((PyObject*)main_module, "catcher");
-		PyObject* output = PyObject_GetAttrString(catcher, "data");
-		char * buffer = PyUnicode_AsUTF8(output);
-		UE_LOG(LogPython, Log, TEXT("%s"), ANSI_TO_TCHAR(buffer));
-
-		PyRun_SimpleString("sys.stdout.flush()");
-		Py_DECREF(catcher);
-		Py_DECREF(output);
-
-	}
 	Py_DECREF(eval_ret);
 }
 
@@ -236,7 +234,7 @@ void FUnrealEnginePythonModule::RunFile(char *filename) {
 	}
 #endif
 
-}
+	}
 
 // run a python script in a new sub interpreter (useful for unit tests)
 void FUnrealEnginePythonModule::RunFileSandboxed(char *filename) {