Adds Python Commandlet.

osstony · osstony · commit eb1b684a6d89 · 2016-10-13T11:33:30.000-07:00
diff --git a/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp b/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp
@@ -117,7 +117,11 @@ void FUnrealEnginePythonModule::RunString(char *str) {
 
 void FUnrealEnginePythonModule::RunFile(char *filename) {
 	FScopePythonGIL gil;
-	char *full_path = TCHAR_TO_UTF8(*FPaths::Combine(*FPaths::GameContentDir(), UTF8_TO_TCHAR("Scripts"), *FString("/"), UTF8_TO_TCHAR(filename)));
+	char *full_path = filename;
+	if (!FPaths::FileExists(filename))
+	{
+		full_path = TCHAR_TO_UTF8(*FPaths::Combine(*FPaths::GameContentDir(), UTF8_TO_TCHAR("Scripts"), *FString("/"), UTF8_TO_TCHAR(filename)));
+	}
 	FILE *fd = nullptr;
 	
 #if PLATFORM_WINDOWS
diff --git a/Source/UnrealEnginePython/Public/PyCommandlet.cpp b/Source/UnrealEnginePython/Public/PyCommandlet.cpp
@@ -0,0 +1,86 @@
+#include "UnrealEnginePythonPrivatePCH.h"
+#include "PyCommandlet.h"
+
+#include "Regex.h"
+
+UPyCommandlet::UPyCommandlet(const FObjectInitializer& ObjectInitializer) 
+	: Super(ObjectInitializer)
+{
+	LogToConsole = 1;
+}
+
+int32 UPyCommandlet::Main(const FString& CommandLine)
+{
+	TArray<FString> Tokens, Switches;
+	TMap<FString, FString> Params;
+	ParseCommandLine(*CommandLine, Tokens, Switches, Params);
+
+	FString Filepath = Tokens[0];
+	if (!FPaths::FileExists(*Filepath))
+	{
+		UE_LOG(LogPython, Error, TEXT("Python file could not be found: %s"), *Filepath);
+		return -1;
+	}
+
+	FString RegexString = FString::Printf(TEXT("(?<=%s).*"), *(Filepath.Replace(TEXT("\\"), TEXT("\\\\"))));
+	const FRegexPattern myPattern(RegexString);
+	FRegexMatcher myMatcher(myPattern, *CommandLine);
+	myMatcher.FindNext();
+	FString PyCommandLine = myMatcher.GetCaptureGroup(0).Trim().TrimTrailing();
+	
+	TArray<FString> PyArgv = {FString()};
+	bool escaped = false;
+	for (int i = 0; i < PyCommandLine.Len(); i++)
+	{
+		if(PyCommandLine[i] == ' ')
+		{
+			PyArgv.Add(FString());
+			continue;
+		}
+		else if(PyCommandLine[i] == '\"' && !escaped)
+		{
+			i++;
+			while(i < PyCommandLine.Len() && !(PyCommandLine[i] == '"'))
+			{
+				PyArgv[PyArgv.Num() - 1].AppendChar(PyCommandLine[i]);
+				i++;
+				if (i == PyCommandLine.Len())
+				{
+					PyArgv[PyArgv.Num() - 1].InsertAt(0, "\"");
+				}
+			}
+		}
+		else
+		{
+			if (PyCommandLine[i] == '\\')
+				escaped = true;
+			else
+				escaped = false;
+			PyArgv[PyArgv.Num() - 1].AppendChar(PyCommandLine[i]);
+		}
+	}
+	PyArgv.Insert(Filepath, 0);
+
+#if PY_MAJOR_VERSION >= 3
+	wchar_t **argv = (**wchar_t)malloc(PyArgv.Num() * sizeof(void*));
+#else
+	char **argv = (char **)malloc(PyArgv.Num() * sizeof(void*));
+#endif
+
+	for (int i=0; i<PyArgv.Num(); i++)
+	{
+#if PY_MAJOR_VERSION >= 3
+		argv[i] = (wchar_t*)malloc(PyArgv[i].Len()+1);
+		wcscpy_s(argv[i], PyArgv[i].Len()+1, *PyArgv[i].ReplaceEscapedCharWithChar());
+#else
+		argv[i] = (char*)malloc(PyArgv[i].Len() + 1);
+		strcpy_s(argv[i], PyArgv[i].Len()+1, TCHAR_TO_UTF8(*PyArgv[i].ReplaceEscapedCharWithChar()));
+#endif
+	}
+
+	PySys_SetArgv(PyArgv.Num(), argv);
+
+	FUnrealEnginePythonModule &PythonModule = FModuleManager::GetModuleChecked<FUnrealEnginePythonModule>("UnrealEnginePython");
+	PythonModule.RunFile(TCHAR_TO_UTF8(*Filepath));
+	return 0;
+}
diff --git a/Source/UnrealEnginePython/Public/PyCommandlet.h b/Source/UnrealEnginePython/Public/PyCommandlet.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "UnrealEd.h"
+#include "Core.h"
+#include "Commandlets/Commandlet.h"
+#include "PyCommandlet.generated.h"
+
+UCLASS()
+class UPyCommandlet : public UCommandlet
+{
+	GENERATED_UCLASS_BODY()
+	virtual int32 Main(const FString& Params) override;
+};
