Implemented saving settings

PipeRift · Mar 1, 2024 · c7818be · c7818be
1 parent 9c6d455
commit c7818be
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 18 deletions.
diff --git a/Libs/AST/Include/AST/Utils/Settings.h b/Libs/AST/Include/AST/Utils/Settings.h
@@ -2,6 +2,9 @@
 
 #pragma once
 
+#include "AST/Utils/Settings.h"
+#include "Pipe/Files/Paths.h"
+
 #include <Pipe/Core/String.h>
 #include <Pipe/Files/Files.h>
 #include <Pipe/Serialize/Formats/JsonFormat.h>
@@ -11,7 +14,7 @@
 
 namespace rift
 {
-	p::String GetUserSettingsPath();
+	p::String GetUserSettingsPath(p::StringView name);
 
 	template<typename T>
 	T& GetUserSettings()
@@ -21,26 +24,37 @@ namespace rift
 		{
 			instance = p::MakeOwned<T>();
 
-			p::String path = GetUserSettingsPath();
-			if (!p::Exists(path))
-			{
-				p::CreateFolder(path);
-			}
-
-			p::AppendToPath(path, p::GetTypeName<T>(false));
-			path.append(".json");
-			if (!p::Exists(path))
+			p::String filePath = GetUserSettingsPath(p::GetTypeName<T>(false));
+			if (!p::Exists(filePath))
 			{
-				p::SaveStringFile(path, "{}");
+				SaveUserSettings<T>();
 			}
-
-			p::String data;
-			if (p::LoadStringFile(path, data))
+			else
 			{
-				p::JsonFormatReader reader{data};
-				reader.GetReader().Serialize(*instance);
+				p::String data;
+				if (p::LoadStringFile(filePath, data))
+				{
+					p::JsonFormatReader reader{data};
+					reader.GetReader().Serialize(*instance);
+				}
 			}
 		}
 		return *instance.Get();
 	}
+
+	template<typename T>
+	void SaveUserSettings()
+	{
+		auto& instance = GetUserSettings<T>();
+		p::JsonFormatWriter writer{};
+		writer.GetWriter().Serialize(instance);
+
+		p::String filePath       = GetUserSettingsPath(p::GetTypeName<T>(false));
+		p::StringView folderPath = p::GetParentPath(filePath);
+		if (!p::Exists(folderPath))
+		{
+			p::CreateFolder(folderPath);
+		}
+		p::SaveStringFile(filePath, writer.ToString());
+	}
 }    // namespace rift
diff --git a/Libs/AST/Src/AST/Utils/Settings.cpp b/Libs/AST/Src/AST/Utils/Settings.cpp
@@ -8,9 +8,12 @@
 
 namespace rift
 {
-	p::String GetUserSettingsPath()
+	p::String GetUserSettingsPath(p::StringView name)
 	{
 		static p::StringView relativeSettingsPath{"Rift"};
-		return p::JoinPaths(p::PlatformPaths::GetUserSettingsPath(), relativeSettingsPath);
+		p::String path =
+		    p::JoinPaths(p::PlatformPaths::GetUserSettingsPath(), relativeSettingsPath, name);
+		path.append(".json");
+		return p::Move(path);
 	}
 }    // namespace rift
diff --git a/Libs/Editor/Src/Editor.cpp b/Libs/Editor/Src/Editor.cpp
@@ -4,6 +4,8 @@
 
 #include "AST/Systems/FunctionsSystem.h"
 #include "AST/Utils/Namespaces.h"
+#include "AST/Utils/Settings.h"
+#include "Statics/EditorSettings.h"
 #include "Statics/SEditor.h"
 #include "Systems/EditorSystem.h"
 #include "Utils/FunctionGraph.h"
@@ -174,6 +176,10 @@ namespace rift::editor
 				Editor::Get().bFilesDirty = true;
 			}));
 
+
+			auto& editorSettings = GetUserSettings<EditorSettings>();
+			editorSettings.recentProjects.AddUnique(p::String(projectPath));
+			SaveUserSettings<EditorSettings>();
 			return true;
 		}
 		return false;