From ff7719fe43de4472bfb5a01736df80bbb76adf12 Mon Sep 17 00:00:00 2001
From: Glliza <g8galtsova@yandex.ru>
Date: Tue, 14 May 2024 10:25:03 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StorageCollection.cs                      | 94 ++++++++-----------
 1 file changed, 37 insertions(+), 57 deletions(-)

diff --git a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs
index f973fe9..8986f61 100644
--- a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs
+++ b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs
@@ -91,7 +91,7 @@ public class StorageCollection<T>
             return null;
         }
     }
-    // <summary>
+    /// <summary>
     /// Сохранение информации по аэробусу в хранилище в файл
     /// </summary>
     /// <param name="filename">Путь и имя файла</param>
@@ -102,45 +102,39 @@ public class StorageCollection<T>
         {
             return false;
         }
-
         if (File.Exists(filename))
         {
             File.Delete(filename);
         }
-
-        StringBuilder sb = new();
-        sb.Append(_collectionKey);
-        foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in
-        _storages)
+        using (StreamWriter writer = new StreamWriter(filename))
         {
-            sb.Append(Environment.NewLine);
-            // не сохраняем пустые коллекции
-            if (value.Value.Count == 0)
+            writer.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))
+                writer.Write(Environment.NewLine);
+                if (value.Value.Count == 0)
                 {
                     continue;
                 }
-                sb.Append(data);
-                sb.Append(_separatorItems);
+                writer.Write(value.Key);
+                writer.Write(_separatorForKeyValue);
+                writer.Write(value.Value.GetCollectionType);
+                writer.Write(_separatorForKeyValue);
+                writer.Write(value.Value.MaxCount);
+                writer.Write(_separatorForKeyValue);
+                foreach (T? item in value.Value.GetItems())
+                {
+                    string data = item?.GetDataForSave() ?? string.Empty;
+                    if (string.IsNullOrEmpty(data))
+                    {
+                        continue;
+                    }
+                    writer.Write(data);
+                    writer.Write(_separatorItems);
+                }
             }
+            return true;
         }
-        using FileStream fs = new(filename, FileMode.Create);
-        byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString());
-        fs.Write(info, 0, info.Length);
-        return true;
     }
 
     /// <summary>
@@ -154,52 +148,38 @@ public class StorageCollection<T>
         {
             return false;
         }
-        string bufferTextFromFile = "";
-        using (FileStream fs = new(filename, FileMode.Open))
-        {
-            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)
+        using StreamReader rd = new StreamReader(filename);
+
+
+        UTF8Encoding temp = new(true);
+        string str = rd.ReadLine();
+        if (str == null || !str.StartsWith(_collectionKey))
         {
             return false;
         }
-        if (!strs[0].Equals(_collectionKey))
-        {
-            //если нет такой записи, то это не те данные
-            return false;
-        }
+
         _storages.Clear();
-        foreach (string data in strs)
+        string strs = "";
+        while ((strs = rd.ReadLine()) != null)
         {
-            string[] record = data.Split(_separatorForKeyValue,
-            StringSplitOptions.RemoveEmptyEntries);
+            string[] record = strs.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);
+            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);
+            string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
             foreach (string elem in set)
             {
                 if (elem?.CreateDrawningBus() is T bus)
                 {
-                    if (collection.Insert(bus) == -1)
+                    if (collection.Insert(bus) < 0)
                     {
                         return false;
                     }