From 01275ea1dd16833d07b00b74a66d1d8a0ea8e09b Mon Sep 17 00:00:00 2001
From: easynickname1 <7326033@gmail.com>
Date: Sun, 26 May 2024 21:09:44 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D1=82=D1=80=D0=B5=D0=B1=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=B8=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D0=B5=20=D1=84=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=BB=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StorageCollection.cs                      | 139 ++++++++----------
 1 file changed, 65 insertions(+), 74 deletions(-)

diff --git a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/StorageCollection.cs b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/StorageCollection.cs
index 8001079..a99fec6 100644
--- a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/StorageCollection.cs
+++ b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/StorageCollection.cs
@@ -116,41 +116,40 @@ public class StorageCollection<T>
             File.Delete(filename);
         }
 
-        StringBuilder sb = new();
-
-        sb.Append(_collectionKey);
-        foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
+        using (StreamWriter wr = new StreamWriter(filename))
         {
-            sb.Append(Environment.NewLine);
-            // Не сохраняем пустые коллекции
-            if (value.Value.Count == 0)
+            wr.Write(_collectionKey);
+            foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
             {
-                continue;
-            }
-
-            sb.Append(value.Key);
-            sb.Append(_separatorForKeyValue);
-            sb.Append(value.Value.GetCollectionType);
-            sb.Append(_separatorForKeyValue);
-            sb.Append(value.Value.MaxCount);
-            sb.Append(_separatorForKeyValue);
-
-            foreach (T? item in value.Value.GetItems())
-            {
-                string data = item?.GetDataForSave() ?? string.Empty;
-                if (string.IsNullOrEmpty(data))
+                StringBuilder sb = new StringBuilder();
+                sb.Append(Environment.NewLine);
+                // Не сохраняем пустые коллекции
+                if (value.Value.Count == 0)
                 {
                     continue;
                 }
 
-                sb.Append(data);
-                sb.Append(_separatorItems);
+                sb.Append(value.Key);
+                sb.Append(_separatorForKeyValue);
+                sb.Append(value.Value.GetCollectionType);
+                sb.Append(_separatorForKeyValue);
+                sb.Append(value.Value.MaxCount);
+                sb.Append(_separatorForKeyValue);
+
+                foreach (T? item in value.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+                    if (string.IsNullOrEmpty(data))
+                    {
+                        continue;
+                    }
+
+                    sb.Append(data);
+                    sb.Append(_separatorItems);
+                }
+                wr.Write(sb);
             }
         }
-
-        using FileStream fs = new(filename, FileMode.Create);
-        byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString());
-        fs.Write(info, 0, info.Length);
         return true;
     }
 
@@ -166,62 +165,54 @@ public class StorageCollection<T>
             return false;
         }
 
-        string bufferTextFromFile = "";
-        using (FileStream fs = new(filename, FileMode.Open))
+        using (StreamReader sr = new StreamReader(filename))
         {
-            byte[] b = new byte[fs.Length];
-            UTF8Encoding temp = new(true);
-            while (fs.Read(b, 0, b.Length) > 0)
-            {
-                bufferTextFromFile += temp.GetString(b);
-            }
-        }
-
-        string[] strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
-        if (strs == null || strs.Length == 0)
-        {
-            return false;
-        }
-
-        if (!strs[0].Equals(_collectionKey))
-        {
-            // Если нет такой записи, то это не те данные
-            return false;
-        }
-
-        _storages.Clear();
-        foreach (string data in strs)
-        {
-            string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-            if (record.Length != 4)
-            {
-                continue;
-            }
-
-            CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
-            ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
-            if (collection == null)
+            string str = sr.ReadLine();
+            if (str == null || str.Length == 0)
             {
                 return false;
             }
 
-            collection.MaxCount = Convert.ToInt32(record[2]);
-
-            string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
-            foreach (string elem in set)
+            if (!str.Equals(_collectionKey))
             {
-                if (elem?.CreateDrawingBoat() is T boat)
-                {
-                    if (collection.Insert(boat) == 0)
-                    {
-                        return false;
-                    }
-                }
+                // Если нет такой записи, то это не те данные
+                return false;
             }
 
-            _storages.Add(record[0], collection);
-        }
+            _storages.Clear();
+            string data = "";
+            while ((data = sr.ReadLine()) != null)
+            {
+                string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                if (record.Length != 4)
+                {
+                    continue;
+                }
 
+                CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
+                ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
+                if (collection == null)
+                {
+                    return false;
+                }
+
+                collection.MaxCount = Convert.ToInt32(record[2]);
+
+                string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+                foreach (string elem in set)
+                {
+                    if (elem?.CreateDrawingBoat() is T boat)
+                    {
+                        if (collection.Insert(boat) == 0)
+                        {
+                            return false;
+                        }
+                    }
+                }
+
+                _storages.Add(record[0], collection);
+            }
+        }
         return true;
     }