changed json serialization, added yaml serializer

dducode · Oct 18, 2024 · e2d94af · e2d94af
1 parent a4e1c34
commit e2d94af
Show file tree

Hide file tree

Showing 30 changed files with 224 additions and 30 deletions.
diff --git a/Editor/SaveSystemSettingsProvider.cs b/Editor/SaveSystemSettingsProvider.cs
@@ -47,6 +47,7 @@ internal class SaveSystemSettingsProvider {
         private SerializedProperty m_encryptProperty;
         private SerializedProperty m_encryptionSettingsProperty;
         private SerializedProperty m_cacheSizeProperty;
+        private SerializedProperty m_jsonSerializationSettingsProperty;
 
 
         [SettingsProvider]
@@ -134,6 +135,9 @@ private void InitializeCommonSettings () {
                 nameof(SaveSystemSettings.encryptionSettings)
             );
             m_cacheSizeProperty = m_serializedSettings.FindProperty(nameof(SaveSystemSettings.cacheSize));
+            m_jsonSerializationSettingsProperty = m_serializedSettings.FindProperty(
+                nameof(SaveSystemSettings.jsonSerializationSettings)
+            );
         }
 
 
@@ -171,6 +175,7 @@ private void DrawCommonSettings () {
 
             EditorGUILayout.PropertyField(m_serializerType);
             EditorGUILayout.PropertyField(m_cacheSizeProperty);
+            DrawJsonSerializationSettings();
             DrawCompressionSettings();
             DrawEncryptionSettings();
 
@@ -218,6 +223,13 @@ private void DrawCheckpointsSettings () {
         }
 
 
+        private void DrawJsonSerializationSettings () {
+            var serializerType = (SerializerType)m_serializerType.enumValueIndex;
+            if (serializerType is SerializerType.JSONSerializer)
+                EditorGUILayout.PropertyField(m_jsonSerializationSettingsProperty);
+        }
+
+
         private void DrawCompressionSettings () {
             EditorGUILayout.PropertyField(m_compressProperty);
 

diff --git a/Plugins.meta b/Plugins.meta
diff --git a/Plugins/Newtonsoft.Json.dll b/Plugins/Newtonsoft.Json.dll
diff --git a/Plugins/Newtonsoft.Json.dll.meta b/Plugins/Newtonsoft.Json.dll.meta
diff --git a/Plugins/YamlDotNet.dll b/Plugins/YamlDotNet.dll
diff --git a/Plugins/YamlDotNet.dll.meta b/Plugins/YamlDotNet.dll.meta
diff --git a/Runtime/ISaveData.cs b/Runtime/ISaveData.cs
@@ -1,8 +1,12 @@
-namespace SaveSystemPackage {
+using Newtonsoft.Json;
+using YamlDotNet.Serialization;
+
+namespace SaveSystemPackage {
 
     public interface ISaveData {
 
-        public bool IsEmpty { get; }
+        [YamlIgnore, JsonIgnore]
+        public bool IsEmpty => false;
 
     }
 

diff --git a/Runtime/Serialization/CodeFormats.cs → Runtime/Internal/CodeFormats.cs b/Runtime/Serialization/CodeFormats.cs → Runtime/Internal/CodeFormats.cs
@@ -1,10 +1,11 @@
-namespace SaveSystemPackage.Serialization {
+namespace SaveSystemPackage.Internal {
 
-    public class CodeFormats {
+    internal class CodeFormats {
 
         public const string XML = "xml";
         public const string JSON = "json";
         public const string Binary = "bin";
+        public const string YAML = "yaml";
 
     }
 

diff --git a/Runtime/Serialization/CodeFormats.cs.meta → Runtime/Internal/CodeFormats.cs.meta b/Runtime/Serialization/CodeFormats.cs.meta → Runtime/Internal/CodeFormats.cs.meta
diff --git a/Runtime/SaveSystem.Settings.cs b/Runtime/SaveSystem.Settings.cs
@@ -184,11 +184,14 @@ private ISerializer SelectSerializer (SaveSystemSettings settings) {
                         serializer = new BinarySerializer();
                         break;
                     case SerializerType.JSONSerializer:
-                        serializer = new JsonSerializer();
+                        serializer = new JsonSerializer(settings.jsonSerializationSettings);
                         break;
                     case SerializerType.XMLSerializer:
                         serializer = new XmlSerializer();
                         break;
+                    case SerializerType.YAMLSerializer:
+                        serializer = new YamlSerializer();
+                        break;
                     case SerializerType.Custom:
                         serializer = null;
                         break;

diff --git a/Runtime/SerializableData/ColorData.cs b/Runtime/SerializableData/ColorData.cs
@@ -11,8 +11,6 @@ public struct ColorData : ISaveData {
         public float b;
         public float a;
 
-        public bool IsEmpty => false;
-
 
         public ColorData (float r, float g, float b, float a) {
             this.r = r;

diff --git a/Runtime/SerializableData/DataBatch.cs b/Runtime/SerializableData/DataBatch.cs
@@ -1,10 +1,13 @@
 using System;
+using Newtonsoft.Json;
+using YamlDotNet.Serialization;
 
 namespace SaveSystemPackage.SerializableData {
 
     [Serializable]
     public class DataBatch<TData> : Map<string, TData>, ISaveData where TData : ISaveData {
 
+        [YamlIgnore, JsonIgnore]
         public bool IsEmpty => Count == 0;
 
     }

diff --git a/Runtime/SerializableData/ProfileData.cs b/Runtime/SerializableData/ProfileData.cs
@@ -1,4 +1,6 @@
 using System;
+using Newtonsoft.Json;
+using YamlDotNet.Serialization;
 
 namespace SaveSystemPackage.SerializableData {
 
@@ -9,6 +11,7 @@ public struct ProfileData : ISaveData {
         public string name;
         public string iconId;
 
+        [YamlIgnore, JsonIgnore]
         public bool IsEmpty =>
             string.IsNullOrEmpty(id)
             && string.IsNullOrEmpty(name)

diff --git a/Runtime/SerializableData/ProfilesManagerData.cs b/Runtime/SerializableData/ProfilesManagerData.cs
@@ -1,11 +1,15 @@
 using System;
+using Newtonsoft.Json;
+using YamlDotNet.Serialization;
 
 namespace SaveSystemPackage.SerializableData {
 
     [Serializable]
     public struct ProfilesManagerData : ISaveData {
 
         public Map<string, string> profilesMap;
+
+        [YamlIgnore, JsonIgnore]
         public bool IsEmpty => profilesMap.Count == 0;
 
     }

diff --git a/Runtime/SerializableData/QuaternionData.cs b/Runtime/SerializableData/QuaternionData.cs
@@ -11,8 +11,6 @@ public struct QuaternionData : ISaveData {
         public float z;
         public float w;
 
-        public bool IsEmpty => false;
-
 
         public QuaternionData (float x, float y, float z, float w) {
             this.x = x;

diff --git a/Runtime/SerializableData/RigidbodyData.cs b/Runtime/SerializableData/RigidbodyData.cs
@@ -12,8 +12,6 @@ public struct RigidbodyData : ISaveData {
         public Vector3Data angularVelocity;
         public bool isKinematic;
 
-        public bool IsEmpty => false;
-
 
         public static implicit operator RigidbodyData (Rigidbody rigidbody) {
             return new RigidbodyData {

diff --git a/Runtime/SerializableData/TransformData.cs b/Runtime/SerializableData/TransformData.cs
@@ -17,8 +17,6 @@ public struct TransformData : ISaveData {
 
         public Vector3Data scale;
 
-        public bool IsEmpty => false;
-
 
         public static implicit operator TransformData (Transform transform) {
             return new TransformData {

diff --git a/Runtime/SerializableData/Vector2Data.cs b/Runtime/SerializableData/Vector2Data.cs
@@ -9,8 +9,6 @@ public struct Vector2Data : ISaveData {
         public float x;
         public float y;
 
-        public bool IsEmpty => false;
-
 
         public Vector2Data (float x, float y) {
             this.x = x;

diff --git a/Runtime/SerializableData/Vector3Data.cs b/Runtime/SerializableData/Vector3Data.cs
@@ -10,8 +10,6 @@ public struct Vector3Data : ISaveData {
         public float y;
         public float z;
 
-        public bool IsEmpty => false;
-
 
         public Vector3Data (float x, float y, float z) {
             this.x = x;

diff --git a/Runtime/SerializableData/Vector4Data.cs b/Runtime/SerializableData/Vector4Data.cs
@@ -11,8 +11,6 @@ public struct Vector4Data : ISaveData {
         public float z;
         public float w;
 
-        public bool IsEmpty => false;
-
 
         public Vector4Data (float x, float y, float z, float w) {
             this.x = x;

diff --git a/Runtime/Serialization/BinarySerializer.cs b/Runtime/Serialization/BinarySerializer.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
+using SaveSystemPackage.Internal;
 
 namespace SaveSystemPackage.Serialization {
 
@@ -23,6 +24,7 @@ public byte[] Serialize<TData> ([NotNull] TData data) where TData : ISaveData {
         public TData Deserialize<TData> (byte[] data) where TData : ISaveData {
             if (data == null || data.Length == 0)
                 return default;
+
             using var stream = new MemoryStream(data);
             var formatter = new BinaryFormatter();
             return (TData)formatter.Deserialize(stream);

diff --git a/Runtime/Serialization/JsonSerializationSettings.cs b/Runtime/Serialization/JsonSerializationSettings.cs
@@ -0,0 +1,14 @@
+using System;
+using Newtonsoft.Json;
+
+namespace SaveSystemPackage.Serialization {
+
+    [Serializable]
+    public class JsonSerializationSettings {
+
+        public Formatting Formatting;
+        public ReferenceLoopHandling ReferenceLoopHandling;
+
+    }
+
+}
diff --git a/Runtime/Serialization/JsonSerializationSettings.cs.meta b/Runtime/Serialization/JsonSerializationSettings.cs.meta
diff --git a/Runtime/Serialization/JsonSerializer.cs b/Runtime/Serialization/JsonSerializer.cs
@@ -1,23 +1,52 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.IO;
 using System.Text;
-using UnityEngine;
+using Newtonsoft.Json;
+using SaveSystemPackage.Internal;
 
 namespace SaveSystemPackage.Serialization {
 
     public class JsonSerializer : ISerializer {
 
+        private readonly JsonSerializationSettings m_settings;
+
+
+        public JsonSerializer (JsonSerializationSettings settings = null) {
+            m_settings = settings ?? new JsonSerializationSettings();
+        }
+
+
         public byte[] Serialize<TData> ([NotNull] TData data) where TData : ISaveData {
             if (data == null)
                 throw new ArgumentNullException(nameof(data));
-            return data.IsEmpty ? Array.Empty<byte>() : Encoding.UTF8.GetBytes(JsonUtility.ToJson(data, true));
+            if (data.IsEmpty)
+                return Array.Empty<byte>();
+
+            var stream = new MemoryStream();
+
+            using (var writer = new StreamWriter(stream, Encoding.UTF8)) {
+                var serializer = new Newtonsoft.Json.JsonSerializer {
+                    Formatting = m_settings.Formatting,
+                    ReferenceLoopHandling = m_settings.ReferenceLoopHandling
+                };
+                serializer.Serialize(writer, data);
+            }
+
+            return stream.ToArray();
         }
 
 
         public TData Deserialize<TData> (byte[] data) where TData : ISaveData {
             if (data == null || data.Length == 0)
                 return default;
-            return JsonUtility.FromJson<TData>(Encoding.UTF8.GetString(data));
+
+            using var reader = new StreamReader(new MemoryStream(data), Encoding.UTF8);
+            var serializer = new Newtonsoft.Json.JsonSerializer {
+                Formatting = m_settings.Formatting,
+                ReferenceLoopHandling = m_settings.ReferenceLoopHandling
+            };
+            return serializer.Deserialize<TData>(new JsonTextReader(reader));
         }