Optimize save/load implimentation duplicated code

Author: Vyacheslav

VoxelGame_UnityProject/Assets/VoxelGame/Voxel/Scripts/SaveLoad/SaveLoadChunk.cs

@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+
+
+namespace VoxelGame.Voxel
+{
+    public abstract class SaveLoadChunk : ISaveLoadChunk
+    {
+        private readonly string pathWorld = "world";
+        private readonly string pathChunkPrefix = "chunk_";
+        private readonly string pathEnd = ".dat";
+
+        private readonly Queue<SavedChunkData> dataQueue = new Queue<SavedChunkData>();
+
+        protected SaveLoadChunk()
+        {
+            Directory.CreateDirectory(Path.Combine(Application.persistentDataPath, pathWorld));
+        }
+
+        public void Save(int maxSavedChunks = 1)
+        {
+            for (int count = 0; count < maxSavedChunks && dataQueue.Count > 0; count++)
+            {
+                SavedChunkData data = dataQueue.Dequeue();
+                SaveChunk(data);
+            }
+        }
+
+        public void AddToSaveQueue(SavedChunkData data)
+        {
+            dataQueue.Enqueue(data);
+        }
+
+        public abstract SavedChunkData Load(Vector2Int coords);
+
+        public void DeleteAll()
+        {
+            string path = Path.Combine(Application.persistentDataPath, pathWorld);
+            if (Directory.Exists(path))
+            {
+                Directory.Delete(path, true);
+            }
+        }
+
+        protected abstract void SaveChunk(SavedChunkData data);
+
+        protected string GetDestination(Vector2Int coords)
+        {
+            return Path.Combine(Application.persistentDataPath, pathWorld, pathChunkPrefix + coords.ToString() + pathEnd);
+        }
+    }
+}

VoxelGame_UnityProject/Assets/VoxelGame/Voxel/Scripts/SaveLoad/SaveLoadChunk.cs.meta

@@ -8,34 +8,9 @@
 
 namespace VoxelGame.Voxel
 {
-    public class SaveLoadChunkBinary : ISaveLoadChunk
+    public class SaveLoadChunkBinary : SaveLoadChunk
     {
-        private readonly string pathWorld = "world";
-        private readonly string pathChunkPrefix = "chunk_";
-        private readonly string pathEnd = ".dat";
-
-        private readonly Queue<SavedChunkData> dataQueue = new Queue<SavedChunkData>();
-
-        private SaveLoadChunkBinary()
-        {
-            Directory.CreateDirectory(Path.Combine(Application.persistentDataPath, pathWorld));
-        }
-
-        public void Save(int maxSavedChunks = 1)
-        {
-            for (int count = 0; count < maxSavedChunks && dataQueue.Count > 0; count++)
-            {
-                SavedChunkData data = dataQueue.Dequeue();
-                SaveChunk(data);
-            }
-        }
-
-        public void AddToSaveQueue(SavedChunkData data)
-        {
-            dataQueue.Enqueue(data);
-        }
-
-        public SavedChunkData Load(Vector2Int coords)
+        public override SavedChunkData Load(Vector2Int coords)
         {
             string destination = GetDestination(coords);
 
@@ -49,25 +24,11 @@ public SavedChunkData Load(Vector2Int coords)
             return null;
         }
 
-        private void SaveChunk(SavedChunkData data)
+        protected override void SaveChunk(SavedChunkData data)
         {
             string destination = GetDestination(new Vector2Int(data.x, data.z));
             byte[] bytes = ByteArrayCompressor.Compress(SerializationUtility.SerializeValue(data, DataFormat.Binary));
             File.WriteAllBytes(destination, bytes);
         }
-
-        private string GetDestination(Vector2Int coords)
-        {
-            return Path.Combine(Application.persistentDataPath, pathWorld, pathChunkPrefix + coords.ToString() + pathEnd);
-        }
-
-        public void DeleteAll()
-        {
-            string path = Path.Combine(Application.persistentDataPath, pathWorld);
-            if (Directory.Exists(path))
-            {
-                Directory.Delete(path, true);
-            }
-        }
     }
 }

VoxelGame_UnityProject/Assets/VoxelGame/Voxel/Scripts/SaveLoad/SaveLoadChunkBinary.cs

@@ -1,75 +1,33 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
 using OdinSerializer;
 using VoxelGame.Utilities;
 
 namespace VoxelGame.Voxel
 {
-    public class SaveLoadChunkJSON : ISaveLoadChunk
+    public class SaveLoadChunkJSON : SaveLoadChunk
     {
-        private readonly string pathWorld = "world1";
-        private readonly string pathChunkPrefix = "chunk_";
-        private readonly string pathEnd = ".txt";
-
-        private readonly Queue<SavedChunkData> dataQueue = new Queue<SavedChunkData>();
-
-        private SaveLoadChunkJSON()
-        {
-            Directory.CreateDirectory(Path.Combine(Application.persistentDataPath, pathWorld));
-        }
-
-        public void Save(int maxSavedChunks = 1)
-        {
-            for (int count = 0; count < maxSavedChunks && dataQueue.Count > 0; count++)
-            {
-                SavedChunkData data = dataQueue.Dequeue();
-                SaveChunk(data);
-            }
-        }
-
-        public void AddToSaveQueue(SavedChunkData data)
-        {
-            dataQueue.Enqueue(data);
-        }
-
-        public SavedChunkData Load(Vector2Int coords)
+        public override SavedChunkData Load(Vector2Int coords)
         {
             string destination = GetDestination(coords);
 
             if (File.Exists(destination))
             {
                 byte[] bytes = File.ReadAllBytes(destination);
-                SavedChunkData loadedData = OdinSerializer.SerializationUtility.DeserializeValue<SavedChunkData>(bytes, DataFormat.JSON);
+                SavedChunkData loadedData = SerializationUtility.DeserializeValue<SavedChunkData>(bytes, DataFormat.JSON);
                 loadedData.map = ByteArrayCompressor.Decompress(loadedData.map);
                 return loadedData;
             }
 
             return null;
         }
 
-        private void SaveChunk(SavedChunkData data)
+        protected override void SaveChunk(SavedChunkData data)
         {
             string destination = GetDestination(new Vector2Int(data.x, data.z));
             data.map = ByteArrayCompressor.Compress(data.map);
-            byte[] bytes = OdinSerializer.SerializationUtility.SerializeValue(data, DataFormat.JSON);
+            byte[] bytes = SerializationUtility.SerializeValue(data, DataFormat.JSON);
             File.WriteAllBytes(destination, bytes);
         }
-
-        private string GetDestination(Vector2Int coords)
-        {
-            return Path.Combine(Application.persistentDataPath, pathWorld, pathChunkPrefix + coords.ToString() + pathEnd);
-        }
-
-        public void DeleteAll()
-        {
-            string path = Path.Combine(Application.persistentDataPath, pathWorld);
-            if (Directory.Exists(path))
-            {
-                Directory.Delete(path, true);
-            }
-        }
     }
 }