Fix Settins issue and close #276. Non-unity build fixed too, close #277

ufna · Feb 26, 2020 · 11adacd · 11adacd
1 parent 06ab9c0
commit 11adacd
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 61 deletions.
diff --git a/Source/VaRest/Private/VaRest.cpp b/Source/VaRest/Private/VaRest.cpp
@@ -3,7 +3,54 @@
 #include "VaRest.h"
 
 #include "VaRestDefines.h"
+#include "VaRestSettings.h"
+
+#include "Developer/Settings/Public/ISettingsModule.h"
+
+#define LOCTEXT_NAMESPACE "FVaRestModule"
+
+void FVaRestModule::StartupModule()
+{
+	ModuleSettings = NewObject<UVaRestSettings>(GetTransientPackage(), "VaRestSettings", RF_Standalone);
+	ModuleSettings->AddToRoot();
+
+	// Register settings
+	if (ISettingsModule* SettingsModule = FModuleManager::GetModulePtr<ISettingsModule>("Settings"))
+	{
+		SettingsModule->RegisterSettings("Project", "Plugins", "VaRest",
+			LOCTEXT("RuntimeSettingsName", "VaRest"),
+			LOCTEXT("RuntimeSettingsDescription", "Configure VaRest plugin settings"),
+			ModuleSettings);
+	}
+
+	UE_LOG(LogVaRest, Log, TEXT("%s: VaRest module started"), *VA_FUNC_LINE);
+}
+
+void FVaRestModule::ShutdownModule()
+{
+	if (ISettingsModule* SettingsModule = FModuleManager::GetModulePtr<ISettingsModule>("Settings"))
+	{
+		SettingsModule->UnregisterSettings("Project", "Plugins", "VaRest");
+	}
+
+	if (!GExitPurge)
+	{
+		ModuleSettings->RemoveFromRoot();
+	}
+	else
+	{
+		ModuleSettings = nullptr;
+	}
+}
+
+UVaRestSettings* FVaRestModule::GetSettings() const
+{
+	check(ModuleSettings);
+	return ModuleSettings;
+}
 
 IMPLEMENT_MODULE(FVaRestModule, VaRest)
 
 DEFINE_LOG_CATEGORY(LogVaRest);
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/VaRest/Private/VaRestLibrary.cpp b/Source/VaRest/Private/VaRestLibrary.cpp
@@ -2,14 +2,18 @@
 
 #include "VaRestLibrary.h"
 
+#include "VaRest.h"
 #include "VaRestDefines.h"
 #include "VaRestJsonObject.h"
 #include "VaRestRequestJSON.h"
+#include "VaRestSettings.h"
 
 #include "Misc/Base64.h"
 
-//////////////////////////////////////////////////////////////////////////
-// Helpers
+UVaRestSettings* UVaRestLibrary::GetVaRestSettings()
+{
+	return FVaRestModule::Get().GetSettings();
+}
 
 FString UVaRestLibrary::PercentEncode(const FString& Source)
 {

diff --git a/Source/VaRest/Private/VaRestRequestJSON.cpp b/Source/VaRest/Private/VaRestRequestJSON.cpp
@@ -6,7 +6,6 @@
 #include "VaRestJsonObject.h"
 #include "VaRestLibrary.h"
 #include "VaRestSettings.h"
-#include "VaRestSubsystem.h"
 
 #include "Json.h"
 #include "Kismet/GameplayStatics.h"
@@ -338,7 +337,7 @@ void UVaRestRequestJSON::ProcessRequest()
 		}
 
 		// Check extended log to avoid security vulnerability (#133)
-		if (GetSettings()->bExtendedLog)
+		if (UVaRestLibrary::GetVaRestSettings()->bExtendedLog)
 		{
 			UE_LOG(LogVaRest, Log, TEXT("%s: Request (urlencoded): %s %s %s %s"), *VA_FUNC_LINE, *HttpRequest->GetVerb(), *HttpRequest->GetURL(), *UrlParams, *StringRequestContent);
 		}
@@ -375,7 +374,7 @@ void UVaRestRequestJSON::ProcessRequest()
 		HttpRequest->SetContentAsString(UrlParams);
 
 		// Check extended log to avoid security vulnerability (#133)
-		if (GetSettings()->bExtendedLog)
+		if (UVaRestLibrary::GetVaRestSettings()->bExtendedLog)
 		{
 			UE_LOG(LogVaRest, Log, TEXT("%s: Request (url body): %s %s %s"), *VA_FUNC_LINE, *HttpRequest->GetVerb(), *HttpRequest->GetURL(), *UrlParams);
 		}
@@ -472,7 +471,7 @@ void UVaRestRequestJSON::OnProcessRequestComplete(FHttpRequestPtr Request, FHttp
 		}
 	}
 
-	if (GetSettings()->bUseChunkedParser)
+	if (UVaRestLibrary::GetVaRestSettings()->bUseChunkedParser)
 	{
 		// Try to deserialize data to JSON
 		const TArray<uint8>& Bytes = Response->GetContent();
@@ -583,15 +582,3 @@ FString UVaRestRequestJSON::GetResponseContentAsString(bool bCacheResponseConten
 	// Return previously cached content now
 	return ResponseContent;
 }
-
-const UVaRestSettings* UVaRestRequestJSON::GetSettings() const
-{
-	auto GI = UGameplayStatics::GetGameInstance(this);
-	if (GI)
-	{
-		return GI->GetSubsystem<UVaRestSubsystem>()->GetSettings();
-	}
-
-	UE_LOG(LogVaRest, Warning, TEXT("%s: No World is provided for Outer object, Default settings will be used"), *VA_FUNC_LINE);
-	return GetDefault<UVaRestSettings>();
-}
diff --git a/Source/VaRest/Private/VaRestSubsystem.cpp b/Source/VaRest/Private/VaRestSubsystem.cpp
@@ -5,14 +5,11 @@
 #include "VaRestDefines.h"
 #include "VaRestJsonObject.h"
 #include "VaRestJsonValue.h"
-#include "VaRestSettings.h"
 
 #include "Developer/Settings/Public/ISettingsModule.h"
 #include "Misc/FileHelper.h"
 #include "Misc/Paths.h"
 
-#define LOCTEXT_NAMESPACE "FVaRest"
-
 UVaRestSubsystem::UVaRestSubsystem()
 	: UGameInstanceSubsystem()
 {
@@ -22,17 +19,6 @@ void UVaRestSubsystem::Initialize(FSubsystemCollectionBase& Collection)
 {
 	Super::Initialize(Collection);
 
-	Settings = NewObject<UVaRestSettings>(GetTransientPackage(), "VaRestSettings", RF_Standalone);
-
-	// Register settings
-	if (ISettingsModule* SettingsModule = FModuleManager::GetModulePtr<ISettingsModule>("Settings"))
-	{
-		SettingsModule->RegisterSettings("Project", "Plugins", "VaRest",
-			LOCTEXT("RuntimeSettingsName", "VaRest"),
-			LOCTEXT("RuntimeSettingsDescription", "Configure VaRest plugin settings"),
-			Settings);
-	}
-
 	UE_LOG(LogVaRest, Log, TEXT("%s: VaRest subsystem initialized"), *VA_FUNC_LINE);
 }
 
@@ -198,11 +184,3 @@ class UVaRestJsonObject* UVaRestSubsystem::LoadJsonFromFile(const FString& Path,
 
 	return nullptr;
 }
-
-UVaRestSettings* UVaRestSubsystem::GetSettings() const
-{
-	check(Settings);
-	return Settings;
-}
-
-#undef LOCTEXT_NAMESPACE
diff --git a/Source/VaRest/Public/VaRest.h b/Source/VaRest/Public/VaRest.h
@@ -4,9 +4,15 @@
 
 #include "Modules/ModuleManager.h"
 
+class UVaRestSettings;
+
 class FVaRestModule : public IModuleInterface
 {
 public:
+	/** IModuleInterface implementation */
+	virtual void StartupModule() override;
+	virtual void ShutdownModule() override;
+
 	/**
 	 * Singleton-like access to this module's interface.  This is just for convenience!
 	 * Beware of calling this during the shutdown phase, though.  Your module might have been unloaded already.
@@ -27,4 +33,11 @@ class FVaRestModule : public IModuleInterface
 	{
 		return FModuleManager::Get().IsModuleLoaded("VaRest");
 	}
+
+	/** Getter for internal settings object to support runtime configuration changes */
+	UVaRestSettings* GetSettings() const;
+
+protected:
+	/** Module settings */
+	UVaRestSettings* ModuleSettings;
 };
diff --git a/Source/VaRest/Public/VaRestJsonObject.h b/Source/VaRest/Public/VaRestJsonObject.h
@@ -17,6 +17,7 @@ class VAREST_API UVaRestJsonObject : public UObject
 {
 	GENERATED_UCLASS_BODY()
 
+public:
 	/** Reset all internal data */
 	UFUNCTION(BlueprintCallable, Category = "VaRest|Json")
 	void Reset();
@@ -161,10 +162,10 @@ class VAREST_API UVaRestJsonObject : public UObject
 		}
 	}
 
-private:
 	//////////////////////////////////////////////////////////////////////////
 	// Array fields helpers (uniform arrays)
 
+public:
 	/** Get the field named FieldName as a Number Array. Use it only if you're sure that array is uniform!
 	 * Attn.!! float used instead of double to make the function blueprintable! */
 	UFUNCTION(BlueprintCallable, Category = "VaRest|Json")

diff --git a/Source/VaRest/Public/VaRestLibrary.h b/Source/VaRest/Public/VaRestLibrary.h
@@ -9,6 +9,8 @@
 
 #include "VaRestLibrary.generated.h"
 
+class UVaRestSettings;
+
 /**
  * Useful tools for REST communications
  */
@@ -17,6 +19,13 @@ class VAREST_API UVaRestLibrary : public UBlueprintFunctionLibrary
 {
 	GENERATED_BODY()
 
+	//////////////////////////////////////////////////////////////////////////
+	// Data Accessors
+public:
+	/** Direct access to the plugin settings */
+	UFUNCTION(BlueprintPure, Category = "VaRest|Common")
+	static UVaRestSettings* GetVaRestSettings();
+
 	//////////////////////////////////////////////////////////////////////////
 	// Helpers
 

diff --git a/Source/VaRest/Public/VaRestRequestJSON.h b/Source/VaRest/Public/VaRestRequestJSON.h
@@ -318,7 +318,4 @@ class VAREST_API UVaRestRequestJSON : public UObject
 public:
 	/** Returns reference to internal request object */
 	TSharedRef<IHttpRequest> GetHttpRequest() const { return HttpRequest; };
-
-	/** Helper function to get runtime settings */
-	const UVaRestSettings* GetSettings() const;
 };
diff --git a/Source/VaRest/Public/VaRestSubsystem.h b/Source/VaRest/Public/VaRestSubsystem.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "VaRestJsonValue.h"
 #include "VaRestRequestJSON.h"
 
 #include "Delegates/DelegateCombinations.h"
@@ -10,10 +11,6 @@
 
 #include "VaRestSubsystem.generated.h"
 
-class UVaRestRequestJSON;
-class UVaRestSettings;
-class UVaRestJsonValue;
-
 DECLARE_DYNAMIC_DELEGATE_OneParam(FVaRestCallDelegate, UVaRestRequestJSON*, Request);
 
 USTRUCT()
@@ -114,17 +111,4 @@ class VAREST_API UVaRestSubsystem : public UGameInstanceSubsystem
 	 */
 	UFUNCTION(BlueprintCallable, Category = "VaRest|Utility")
 	class UVaRestJsonObject* LoadJsonFromFile(const FString& Path, const bool bIsRelativeToContentDir = true);
-
-	//////////////////////////////////////////////////////////////////////////
-	// Data getters and helpers
-
-public:
-	/** Getter for internal settings object to support runtime configuration changes */
-	UFUNCTION(BlueprintCallable, Category = "VaRest|Subsystem")
-	UVaRestSettings* GetSettings() const;
-
-private:
-	/** Plugin settings */
-	UPROPERTY()
-	UVaRestSettings* Settings;
 };