Merge pull request #5 from TarasK8/feature/default-file

TarasK8 · web-flow · commit 3af44ebc6d7c · 2024-05-04T16:46:43.000+03:00
Feature/default file
diff --git a/Editor/FileObjectEditor.cs b/Editor/FileObjectEditor.cs
@@ -0,0 +1,35 @@
+using Newtonsoft.Json.Linq;
+using TarasK8.SaveSystem;
+using TarasK8.SaveSystemEditor.JEditor;
+using UnityEditor;
+using UnityEngine;
+
+namespace TarasK8.SaveSystemEditor
+{
+    [CustomEditor(typeof(FileObject))]
+    public class FileObjectEditor : Editor
+    {
+        private SerializedProperty _json_string;
+        private JsonEditor _fileEditor;
+
+        private void OnEnable()
+        {
+            _json_string = serializedObject.FindProperty("_json");
+
+            string json = _json_string.stringValue;
+            JToken token =  string.IsNullOrEmpty(json) ? new JObject() : JToken.Parse(json);
+            _fileEditor = new JsonEditor(token, this);
+        }
+
+        public override void OnInspectorGUI()
+        {
+            _fileEditor.DrawEditor();
+        }
+
+        private void OnDisable()
+        {
+            _json_string.stringValue = _fileEditor.GetJson();
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}
diff --git a/Editor/FileObjectEditor.cs.meta b/Editor/FileObjectEditor.cs.meta
diff --git a/Editor/SaveSystemObjectEditor.cs b/Editor/SaveSystemObjectEditor.cs
@@ -4,6 +4,7 @@
 using TarasK8.SaveSystemEditor.JEditor;
 using UnityEditor;
 using UnityEngine;
+using static TarasK8.SaveSystem.SaveSystemObject;
 
 namespace TarasK8.SaveSystemEditor
 {
@@ -25,6 +26,10 @@ public class SaveSystemObjectEditor : Editor
         private SerializedProperty _encryptionPassword_string;
         private SerializedProperty _autoSaving_bool;
         private SerializedProperty _savePerion_int;
+        private SerializedProperty _enableDefaultFile_bool;
+        private SerializedProperty _defaultFileType_enum;
+        private SerializedProperty _defaultFileObject_obj;
+        private SerializedProperty _defaultFile_fileObj;
 
         private SerializedProperty _onSave_event;
         private SerializedProperty _onLoad_event;
@@ -45,6 +50,11 @@ private void OnEnable()
             _autoSaving_bool = serializedObject.FindProperty("_autoSaving");
             _savePerion_int = serializedObject.FindProperty("_savePeriod");
 
+            _enableDefaultFile_bool = serializedObject.FindProperty("_enableDefaultFile");
+            _defaultFileType_enum = serializedObject.FindProperty("_defaultFileType");
+            _defaultFileObject_obj = serializedObject.FindProperty("_defaultFileObject");
+            _defaultFile_fileObj = serializedObject.FindProperty("_defaultFile");
+
             _onSave_event = serializedObject.FindProperty("OnSave");
             _onLoad_event = serializedObject.FindProperty("OnLoad");
         }
@@ -86,6 +96,25 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(_savePerion_int, new GUIContent("Period (seconds)"));
             EditorGUILayout.EndHorizontal();
 
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.PropertyField(_enableDefaultFile_bool, new GUIContent("Default Data"));
+            if (_enableDefaultFile_bool.boolValue)
+            {
+                EditorGUILayout.BeginHorizontal();
+                switch ((DefaultFileType)_defaultFileType_enum.enumValueIndex)
+                {
+                    case DefaultFileType.File:
+                        EditorGUILayout.PropertyField(_defaultFile_fileObj, new GUIContent(string.Empty));
+                        break;
+                    case DefaultFileType.Object:
+                        EditorGUILayout.PropertyField(_defaultFileObject_obj, new GUIContent(string.Empty));
+                        break;
+                }
+                EditorGUILayout.PropertyField(_defaultFileType_enum, new GUIContent(string.Empty), GUILayout.Width(60f));
+                EditorGUILayout.EndHorizontal();
+            }
+            EditorGUILayout.EndHorizontal();
+
             EditorGUILayout.Space(10f);
 
             EditorGUILayout.LabelField("Events", EditorStyles.boldLabel);
diff --git a/Runtime/FileObject.cs b/Runtime/FileObject.cs
@@ -0,0 +1,15 @@
+using UnityEngine;
+
+namespace TarasK8.SaveSystem
+{
+    [CreateAssetMenu(fileName ="New File", menuName = "Save System/File")]
+    public class FileObject : ScriptableObject
+    {
+        [SerializeField] private string _json;
+
+        public string GetJson()
+        {
+            return _json;
+        }
+    }
+}
diff --git a/Runtime/FileObject.cs.meta b/Runtime/FileObject.cs.meta
diff --git a/Runtime/SFile.cs b/Runtime/SFile.cs
@@ -131,6 +131,18 @@ public void LoadFromJson(string json)
                 _data = data;
         }
 
+        public void MergeFromJson(string json)
+        {
+            JObject o1 = JObject.FromObject(_data);
+            JObject o2 = JObject.Parse(json);
+            o2.Merge(o1, new JsonMergeSettings
+            {
+                // union array values together to avoid duplicates
+                MergeArrayHandling = MergeArrayHandling.Union
+            });
+            LoadFromJson(o2.ToString());
+        }
+
         public string GetJson()
         {
             return JsonConvert.SerializeObject(_data, Formatting.Indented);
diff --git a/Runtime/SaveSystemObject.cs b/Runtime/SaveSystemObject.cs
@@ -1,3 +1,4 @@
+using Newtonsoft.Json;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -21,6 +22,10 @@ public class SaveSystemObject : MonoBehaviour
         [SerializeField] private string _encryptionPassword = "password";
         [SerializeField] private bool _autoSaving = false;
         [SerializeField] private float _savePeriod = 30f;
+        [SerializeField] private bool _enableDefaultFile = false;
+        [SerializeField] private DefaultFileType _defaultFileType;
+        [SerializeField] private Object _defaultFileObject = null;
+        [SerializeField] private FileObject _defaultFile = null;
 
         // [Header("Events")]
         [SerializeField] public UnityEvent<SFile> OnSave;
@@ -51,9 +56,12 @@ public void Initialize()
         public void Save()
         {
             if(_collectSaveablesEverySave) _seveables = GetObjectsForSave();
-            foreach (var saveObject in _seveables)
+            if (_seveables != null)
             {
-                saveObject.OnSave(File);
+                foreach (var saveObject in _seveables)
+                {
+                    //saveObject.OnSave(File);
+                }
             }
             OnSave?.Invoke(File);
             File.Save(GetPath(), GetPassword());
@@ -62,18 +70,27 @@ public void Save()
         public void Load()
         {
             if (_collectSaveablesEverySave) _seveables = GetObjectsForSave();
+
             File.Load(GetPath(), GetPassword());
+
+            if (_enableDefaultFile)
+            {
+                File.MergeFromJson(GetDefaultDataJson());
+            }
+
             foreach (var saveObject in _seveables)
             {
                 saveObject.OnLoad(File);
             }
+
             OnLoad?.Invoke(File);
         }
 
         public void StartAutosaving(float period)
         {
             _autoSaving = true;
             _savePeriod = period;
+            if (period < 1f) return;
             _autosavingRoutine = StartCoroutine(AutosavingRoutine(period));
         }
 
@@ -121,11 +138,29 @@ public string GetPassword()
             return _useEncryption ? _encryptionPassword : string.Empty;
         }
 
+        private string GetDefaultDataJson()
+        {
+            if(_defaultFileType == DefaultFileType.File)
+            {
+                return _defaultFile.GetJson();
+            }
+            else
+            {
+                return JsonConvert.SerializeObject(_defaultFileObject);
+            }
+        }
+
         public enum PathType
         {
             PersistentDataPath = 1,
             DataPath = 2,
             CustomPath = 3
         }
+
+        public enum DefaultFileType
+        {
+            File = 0,
+            Object = 1,
+        }
     }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.tarask8.save-system",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "displayName": "Save System",
   "description": "This is a simple save system for unity.",
   "unity": "2022.3",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.tarask8.save-system",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.3.0",`
`4`	`4`	`"displayName": "Save System",`
`5`	`5`	`"description": "This is a simple save system for unity.",`
`6`	`6`	`"unity": "2022.3",`