feat: backup save

serg.morozov · serg.morozov · commit 20b617d8fbde · 2022-08-27T11:50:37.000+03:00
diff --git a/Assets/com.nuclearband.sodatabase/Runtime/Holders/FolderHolder.cs b/Assets/com.nuclearband.sodatabase/Runtime/Holders/FolderHolder.cs
@@ -10,10 +10,10 @@ namespace NuclearBand
     public class FolderHolder : Holder
     {
         [HideInInspector]
-        public Dictionary<string, DataNode> DataNodes = new Dictionary<string, DataNode>();
+        public Dictionary<string, DataNode> DataNodes = new();
         
         [HideInInspector]
-        public Dictionary<string, FolderHolder> FolderHolders = new Dictionary<string, FolderHolder>();
+        public Dictionary<string, FolderHolder> FolderHolders = new();
 
         public FolderHolder() : base()
         {
diff --git a/Assets/com.nuclearband.sodatabase/Runtime/SODatabase.cs b/Assets/com.nuclearband.sodatabase/Runtime/SODatabase.cs
@@ -13,20 +13,23 @@ namespace NuclearBand
     public static class SODatabase
     {
         public static string SavePath => Application.persistentDataPath + @"/save.txt";
+        public static string SaveBakPath => Application.persistentDataPath + @"/save.bak";
 
         private static FolderHolder root = null!;
 
-        private static Dictionary<string, object> runtimeModels = new Dictionary<string, object>();
+        private static readonly Dictionary<string, object> runtimeModels = new();
 
-        private static JsonSerializerSettings jsonSerializerSettings => new JsonSerializerSettings
+        private static bool saving = false;
+        
+        private static JsonSerializerSettings jsonSerializerSettings => new()
         {
             Formatting = Formatting.Indented,
             TypeNameHandling = TypeNameHandling.All,
             ReferenceResolverProvider = () => new DataNodeReferenceResolver(),
             ObjectCreationHandling = ObjectCreationHandling.Replace,
         };
         
-        private static JsonSerializerSettings jsonRuntimeSerializerSettings => new JsonSerializerSettings
+        private static JsonSerializerSettings jsonRuntimeSerializerSettings => new()
         {
             Formatting = Formatting.Indented,
             TypeNameHandling = TypeNameHandling.All,
@@ -137,6 +140,13 @@ public static async void Save()
 
         public static async Task SaveAsync()
         {
+            if (saving)
+                return;
+            
+            saving = true;
+            if (File.Exists(SavePath))
+                File.Copy(SavePath, SaveBakPath, true);
+            
             var staticNodes = new Dictionary<string, string>();
             foreach (var dataNode in DataNodes(root))
             {
@@ -155,6 +165,7 @@ public static async Task SaveAsync()
             
             using var fileStream = new StreamWriter(SavePath);
             await fileStream.WriteAsync(JsonConvert.SerializeObject(save));
+            saving = false;
         }
 
         public static async void Load()
@@ -169,27 +180,50 @@ public static async Task LoadAsync()
                     dataNode.AfterLoad();
                 return;
             }
-            
-            using var fileStream = new StreamReader(SavePath);
-            var serializedDictionary = await fileStream.ReadToEndAsync();
-            var save = JsonConvert.DeserializeObject<SODatabaseSaveFormat>(serializedDictionary);
-            
-            foreach (var dataNode in DataNodes(root))
-            {
-                DataNodeReferenceResolver.CurrentDataNode = dataNode;
-                var json = save.StaticNodes.ContainsKey(dataNode.FullPath) ? save.StaticNodes[dataNode.FullPath] : string.Empty;
-                if (string.IsNullOrEmpty(json))
-                    continue;
-                DataNodeReferenceResolver.CurrentDataNode = dataNode; 
-                JsonConvert.PopulateObject(json, dataNode, jsonSerializerSettings);
-            }
-            
-            runtimeModels.Clear();
-            foreach (var runtimeNodePair in save.RuntimeNodes)
+
+            do
             {
-                var x = JsonConvert.DeserializeObject(runtimeNodePair.Value, jsonRuntimeSerializerSettings)!;
-                runtimeModels.Add(runtimeNodePair.Key, x);
-            }
+                try
+                {
+                    using var fileStream = new StreamReader(SavePath);
+                    var serializedDictionary = await fileStream.ReadToEndAsync();
+                    var save = JsonConvert.DeserializeObject<SODatabaseSaveFormat>(serializedDictionary);
+                    if (save == null)
+                        throw new Exception();
+
+                    foreach (var dataNode in DataNodes(root))
+                    {
+                        DataNodeReferenceResolver.CurrentDataNode = dataNode;
+                        var json = save.StaticNodes.ContainsKey(dataNode.FullPath)
+                            ? save.StaticNodes[dataNode.FullPath]
+                            : string.Empty;
+                        if (string.IsNullOrEmpty(json))
+                            continue;
+                        DataNodeReferenceResolver.CurrentDataNode = dataNode;
+                        JsonConvert.PopulateObject(json, dataNode, jsonSerializerSettings);
+                    }
+
+                    runtimeModels.Clear();
+                    foreach (var runtimeNodePair in save.RuntimeNodes)
+                    {
+                        var x = JsonConvert.DeserializeObject(runtimeNodePair.Value, jsonRuntimeSerializerSettings)!;
+                        runtimeModels.Add(runtimeNodePair.Key, x);
+                    }
+
+                    break;
+                }
+                catch (Exception)
+                {
+                    if (File.Exists(SaveBakPath))
+                    {
+                        File.Copy(SaveBakPath, SavePath, true);
+                        File.Delete(SaveBakPath);
+                        continue;
+                    }
+
+                    break;
+                }
+            } while (true);
 
             foreach (var dataNode in DataNodes(root))
                 dataNode.AfterLoad();
diff --git a/Assets/com.nuclearband.sodatabase/Runtime/SerializationUtilities/SODatabaseSaveFormat.cs b/Assets/com.nuclearband.sodatabase/Runtime/SerializationUtilities/SODatabaseSaveFormat.cs
@@ -6,7 +6,7 @@ namespace NuclearBand
 {
     public class SODatabaseSaveFormat
     {
-        public Dictionary<string, string> StaticNodes = new Dictionary<string, string>();
-        public Dictionary<string, string> RuntimeNodes = new Dictionary<string, string>();
+        public Dictionary<string, string> StaticNodes = new();
+        public Dictionary<string, string> RuntimeNodes = new();
     }
 }
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,13 +1,13 @@
 {
   "dependencies": {
-    "com.unity.addressables": "1.19.19",
-    "com.unity.ide.rider": "3.0.13",
-    "com.unity.ide.visualstudio": "2.0.14",
+    "com.unity.addressables": "1.20.5",
+    "com.unity.ide.rider": "3.0.15",
+    "com.unity.ide.visualstudio": "2.0.16",
     "com.unity.ide.vscode": "1.2.5",
-    "com.unity.nuget.newtonsoft-json": "2.0.2",
-    "com.unity.test-framework": "1.1.31",
+    "com.unity.nuget.newtonsoft-json": "3.0.2",
+    "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.6.4",
+    "com.unity.timeline": "1.7.1",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -1,11 +1,11 @@
 {
   "dependencies": {
     "com.unity.addressables": {
-      "version": "1.19.19",
+      "version": "1.20.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.scriptablebuildpipeline": "1.19.6",
+        "com.unity.scriptablebuildpipeline": "1.20.2",
         "com.unity.modules.assetbundle": "1.0.0",
         "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0",
@@ -22,7 +22,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.13",
+      "version": "3.0.15",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -31,7 +31,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.14",
+      "version": "2.0.16",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -47,21 +47,21 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.nuget.newtonsoft-json": {
-      "version": "2.0.2",
+      "version": "3.0.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.scriptablebuildpipeline": {
-      "version": "1.19.6",
+      "version": "1.20.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.31",
+      "version": "1.1.33",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -81,7 +81,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.6.4",
+      "version": "1.7.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.2.19f1
-m_EditorVersionWithRevision: 2021.2.19f1 (602ecdbb2fb0)
+m_EditorVersion: 2022.1.13f1
+m_EditorVersionWithRevision: 2022.1.13f1 (22856944e6d2)
diff --git a/ProjectSettings/RiderScriptEditorPersistedState.asset b/ProjectSettings/RiderScriptEditorPersistedState.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
+  lastWriteTicks: -8585494112810372608

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@ namespace NuclearBand`
`10`	`10`	`public class FolderHolder : Holder`
`11`	`11`	`{`
`12`	`12`	`[HideInInspector]`
`13`		`- public Dictionary<string, DataNode> DataNodes = new Dictionary<string, DataNode>();`
	`13`	`+ public Dictionary<string, DataNode> DataNodes = new();`
`14`	`14`
`15`	`15`	`[HideInInspector]`
`16`		`- public Dictionary<string, FolderHolder> FolderHolders = new Dictionary<string, FolderHolder>();`
	`16`	`+ public Dictionary<string, FolderHolder> FolderHolders = new();`
`17`	`17`
`18`	`18`	`public FolderHolder() : base()`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace NuclearBand`
`6`	`6`	`{`
`7`	`7`	`public class SODatabaseSaveFormat`
`8`	`8`	`{`
`9`		`- public Dictionary<string, string> StaticNodes = new Dictionary<string, string>();`
`10`		`- public Dictionary<string, string> RuntimeNodes = new Dictionary<string, string>();`
	`9`	`+ public Dictionary<string, string> StaticNodes = new();`
	`10`	`+ public Dictionary<string, string> RuntimeNodes = new();`
`11`	`11`	`}`
`12`	`12`	`}`