Доработка лабораторной работы

Project_airbus/Project_airbus/CollectionGenericObjects/StorageCollection.cs

@@ -95,31 +95,28 @@ public class StorageCollection<T>
         {
             return false;
         }
-
         if (File.Exists(filename))
         {
             File.Delete(filename);
         }
-
+        using (StreamWriter writer = new StreamWriter(filename))
-        StringBuilder sb = new();
+        {
-
+            writer.Write(_collectionKey);
-        sb.Append(_collectionKey);
             foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
             {
+                StringBuilder sb = new();
                 sb.Append(Environment.NewLine);
                 // не сохраняем пустые коллекции
                 if (value.Value.Count == 0)
                 {
                     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;
@@ -127,15 +124,13 @@ public class StorageCollection<T>
                     {
                         continue;
                     }
-
                     sb.Append(data);
                     sb.Append(_separatorItems);
                 }
+                writer.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;
     }
 
@@ -150,54 +145,39 @@ public class StorageCollection<T>
         {
             return false;
         }
-
+        using (StreamReader fs = File.OpenText(filename))
-        string bufferTextFromFile = "";
-        using (FileStream fs = new(filename, FileMode.Open))
         {
-            byte[] b = new byte[fs.Length];
+            string str = fs.ReadLine();
-            UTF8Encoding temp = new(true);
+            if (str == null || str.Length == 0)
-            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 (!str.StartsWith(_collectionKey))
-        if (!strs[0].Equals(_collectionKey))
             {
-            //если нет такой записи, то это не те данные
                 return false;
             }
-
             _storages.Clear();
-        foreach (string data in strs)
+            string strs = "";
+            while ((strs = fs.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);
                 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?.CreateDrawingAirplan() is T airplan)
+                    if (elem?. CreateDrawingAirplan() is T ship)
                     {
-                    if (collection.Insert(airplan) == -1)
+                        if (collection.Insert(ship) == -1)
                         {
                             return false;
                         }
@@ -205,9 +185,9 @@ public class StorageCollection<T>
                 }
                 _storages.Add(record[0], collection);
             }
-
             return true;
         }
+    }
 
     /// <summary>
     /// Создание коллекции по типу