PythonScripts

crazytuzi · crazytuzi · commit f2de7ffe4120 · 2022-04-28T16:10:32.000+08:00
diff --git a/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp b/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp
@@ -386,7 +386,7 @@ void FUnrealEnginePythonModule::StartupModule()
 		IniValue.ParseIntoArray(ImportModules, separators, 3);
 	}
 
-	FString ProjectScriptsPath = FPaths::Combine(*PROJECT_CONTENT_DIR, UTF8_TO_TCHAR("Scripts"));
+	FString ProjectScriptsPath = FPaths::Combine(*PROJECT_CONTENT_DIR, UTF8_TO_TCHAR("PythonScripts"));
 	if (!FPaths::DirectoryExists(ProjectScriptsPath))
 	{
 		FPlatformFileManager::Get().GetPlatformFile().CreateDirectory(*ProjectScriptsPath);
@@ -396,7 +396,7 @@ void FUnrealEnginePythonModule::StartupModule()
 #if WITH_EDITOR
 	for (TSharedRef<IPlugin>plugin : IPluginManager::Get().GetEnabledPlugins())
 	{
-		FString PluginScriptsPath = FPaths::Combine(plugin->GetContentDir(), UTF8_TO_TCHAR("Scripts"));
+		FString PluginScriptsPath = FPaths::Combine(plugin->GetContentDir(), UTF8_TO_TCHAR("PythonScripts"));
 		if (FPaths::DirectoryExists(PluginScriptsPath))
 		{
 			ScriptsPaths.Add(PluginScriptsPath);
@@ -476,27 +476,27 @@ void FUnrealEnginePythonModule::StartupModule()
 	FString UnrealEnginePython_OBBPath;
 	if (FPaths::FileExists(*(OBBDir1 / MainOBBName)))
 	{
-		UnrealEnginePython_OBBPath = OBBDir1 / MainOBBName / FApp::GetProjectName() / FString(TEXT("Content/Scripts"));
+		UnrealEnginePython_OBBPath = OBBDir1 / MainOBBName / FApp::GetProjectName() / FString(TEXT("Content/PythonScripts"));
 	}
 	else if (FPaths::FileExists(*(OBBDir2 / MainOBBName)))
 	{
-		UnrealEnginePython_OBBPath = OBBDir2 / MainOBBName / FApp::GetProjectName() / FString(TEXT("Content/Scripts"));
+		UnrealEnginePython_OBBPath = OBBDir2 / MainOBBName / FApp::GetProjectName() / FString(TEXT("Content/PythonScripts"));
 	}
 	if (FPaths::FileExists(*(OBBDir1 / PatchOBBName)))
 	{
-		UnrealEnginePython_OBBPath = OBBDir1 / PatchOBBName / FApp::GetProjectName() / FString(TEXT("Content/Scripts"));
+		UnrealEnginePython_OBBPath = OBBDir1 / PatchOBBName / FApp::GetProjectName() / FString(TEXT("Content/PythonScripts"));
 	}
 	else if (FPaths::FileExists(*(OBBDir2 / PatchOBBName)))
 	{
-		UnrealEnginePython_OBBPath = OBBDir1 / PatchOBBName / FApp::GetProjectName() / FString(TEXT("Content/Scripts"));
+		UnrealEnginePython_OBBPath = OBBDir1 / PatchOBBName / FApp::GetProjectName() / FString(TEXT("Content/PythonScripts"));
 	}
 
 	if (!UnrealEnginePython_OBBPath.IsEmpty())
 	{
 		ScriptsPaths.Add(UnrealEnginePython_OBBPath);
 	}
 
-	FString FinalPath = GFilePathBase / FString("UE4Game") / FApp::GetProjectName() / FApp::GetProjectName() / FString(TEXT("Content/Scripts"));
+	FString FinalPath = GFilePathBase / FString("UE4Game") / FApp::GetProjectName() / FApp::GetProjectName() / FString(TEXT("Content/PythonScripts"));
 	ScriptsPaths.Add(FinalPath);
 
 	FString BasePythonPath = FinalPath / FString(TEXT("stdlib.zip")) + FString(":") + FinalPath;
@@ -514,7 +514,7 @@ void FUnrealEnginePythonModule::StartupModule()
     FString IOSContentPath = IFileManager::Get().ConvertToAbsolutePathForExternalAppForRead(*IFileManager::Get().GetFilenameOnDisk(*FPaths::ConvertRelativePathToFull(PROJECT_CONTENT_DIR)));
     FString PyScriptsSearchPath = IOSContentPath / FString(TEXT("lib")) + FString(":") +
                                 IOSContentPath / FString(TEXT("lib/stdlib.zip")) + FString(":") +
-                                IOSContentPath / FString(TEXT("scripts")); // the name of directory must be lower-case.
+                                IOSContentPath / FString(TEXT("pythonscripts")); // the name of directory must be lower-case.
 
     Py_SetPath(Py_DecodeLocale(TCHAR_TO_UTF8(*PyScriptsSearchPath), NULL));
     

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ void FUnrealEnginePythonModule::StartupModule()`
`386`	`386`	`IniValue.ParseIntoArray(ImportModules, separators, 3);`
`387`	`387`	`}`
`388`	`388`
`389`		`- FString ProjectScriptsPath = FPaths::Combine(*PROJECT_CONTENT_DIR, UTF8_TO_TCHAR("Scripts"));`
	`389`	`+ FString ProjectScriptsPath = FPaths::Combine(*PROJECT_CONTENT_DIR, UTF8_TO_TCHAR("PythonScripts"));`
`390`	`390`	`if (!FPaths::DirectoryExists(ProjectScriptsPath))`
`391`	`391`	`{`
`392`	`392`	`FPlatformFileManager::Get().GetPlatformFile().CreateDirectory(*ProjectScriptsPath);`
`@@ -396,7 +396,7 @@ void FUnrealEnginePythonModule::StartupModule()`
`396`	`396`	`#if WITH_EDITOR`
`397`	`397`	`for (TSharedRef<IPlugin>plugin : IPluginManager::Get().GetEnabledPlugins())`
`398`	`398`	`{`
`399`		`- FString PluginScriptsPath = FPaths::Combine(plugin->GetContentDir(), UTF8_TO_TCHAR("Scripts"));`
	`399`	`+ FString PluginScriptsPath = FPaths::Combine(plugin->GetContentDir(), UTF8_TO_TCHAR("PythonScripts"));`
`400`	`400`	`if (FPaths::DirectoryExists(PluginScriptsPath))`
`401`	`401`	`{`
`402`	`402`	`ScriptsPaths.Add(PluginScriptsPath);`
`@@ -476,27 +476,27 @@ void FUnrealEnginePythonModule::StartupModule()`
`476`	`476`	`FString UnrealEnginePython_OBBPath;`
`477`	`477`	`if (FPaths::FileExists(*(OBBDir1 / MainOBBName)))`
`478`	`478`	`{`
`479`		`- UnrealEnginePython_OBBPath = OBBDir1 / MainOBBName / FApp::GetProjectName() / FString(TEXT("Content/Scripts"));`
	`479`	`+ UnrealEnginePython_OBBPath = OBBDir1 / MainOBBName / FApp::GetProjectName() / FString(TEXT("Content/PythonScripts"));`
`480`	`480`	`}`
`481`	`481`	`else if (FPaths::FileExists(*(OBBDir2 / MainOBBName)))`
`482`	`482`	`{`
`483`		`- UnrealEnginePython_OBBPath = OBBDir2 / MainOBBName / FApp::GetProjectName() / FString(TEXT("Content/Scripts"));`
	`483`	`+ UnrealEnginePython_OBBPath = OBBDir2 / MainOBBName / FApp::GetProjectName() / FString(TEXT("Content/PythonScripts"));`
`484`	`484`	`}`
`485`	`485`	`if (FPaths::FileExists(*(OBBDir1 / PatchOBBName)))`
`486`	`486`	`{`
`487`		`- UnrealEnginePython_OBBPath = OBBDir1 / PatchOBBName / FApp::GetProjectName() / FString(TEXT("Content/Scripts"));`
	`487`	`+ UnrealEnginePython_OBBPath = OBBDir1 / PatchOBBName / FApp::GetProjectName() / FString(TEXT("Content/PythonScripts"));`
`488`	`488`	`}`
`489`	`489`	`else if (FPaths::FileExists(*(OBBDir2 / PatchOBBName)))`
`490`	`490`	`{`
`491`		`- UnrealEnginePython_OBBPath = OBBDir1 / PatchOBBName / FApp::GetProjectName() / FString(TEXT("Content/Scripts"));`
	`491`	`+ UnrealEnginePython_OBBPath = OBBDir1 / PatchOBBName / FApp::GetProjectName() / FString(TEXT("Content/PythonScripts"));`
`492`	`492`	`}`
`493`	`493`
`494`	`494`	`if (!UnrealEnginePython_OBBPath.IsEmpty())`
`495`	`495`	`{`
`496`	`496`	`ScriptsPaths.Add(UnrealEnginePython_OBBPath);`
`497`	`497`	`}`
`498`	`498`
`499`		`- FString FinalPath = GFilePathBase / FString("UE4Game") / FApp::GetProjectName() / FApp::GetProjectName() / FString(TEXT("Content/Scripts"));`
	`499`	`+ FString FinalPath = GFilePathBase / FString("UE4Game") / FApp::GetProjectName() / FApp::GetProjectName() / FString(TEXT("Content/PythonScripts"));`
`500`	`500`	`ScriptsPaths.Add(FinalPath);`
`501`	`501`
`502`	`502`	`FString BasePythonPath = FinalPath / FString(TEXT("stdlib.zip")) + FString(":") + FinalPath;`
`@@ -514,7 +514,7 @@ void FUnrealEnginePythonModule::StartupModule()`
`514`	`514`	`FString IOSContentPath = IFileManager::Get().ConvertToAbsolutePathForExternalAppForRead(IFileManager::Get().GetFilenameOnDisk(FPaths::ConvertRelativePathToFull(PROJECT_CONTENT_DIR)));`
`515`	`515`	`FString PyScriptsSearchPath = IOSContentPath / FString(TEXT("lib")) + FString(":") +`
`516`	`516`	`IOSContentPath / FString(TEXT("lib/stdlib.zip")) + FString(":") +`
`517`		`- IOSContentPath / FString(TEXT("scripts")); // the name of directory must be lower-case.`
	`517`	`+ IOSContentPath / FString(TEXT("pythonscripts")); // the name of directory must be lower-case.`
`518`	`518`
`519`	`519`	`Py_SetPath(Py_DecodeLocale(TCHAR_TO_UTF8(*PyScriptsSearchPath), NULL));`
`520`	`520`