лаб 6

ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ListGenericObjects.cs

@@ -21,11 +21,10 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
 
     public int Count => _collection.Count;
 
-    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+    public int MaxCount { set { if (value > 0) { _maxCount = value; } } get { return Count; } }
      
     public CollectionType GetCollectionType => CollectionType.List;
 
-    public int MaxCount { get; set; }
 
     /// <summary>
     /// Конструктор

ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs

@@ -10,25 +10,38 @@ namespace ProjectAirBus.CollectionGenericObjects;
 
 public class StorageCollection<T>
     where T : DrawningBus
-{
-   
-    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
-
-    
+{/// <summary>
+ /// Словарь (хранилище) с коллекциями
+ /// </summary>
+    private Dictionary<string, ICollectionGenericObjects<T>> _storages;
+    /// <summary>
+    /// Возвращение списка названий коллекций
+    /// </summary>
     public List<string> Keys => _storages.Keys.ToList();
 
-    private readonly string _collectionKey = "CollectionStorage";
+    /// <summary>
+    /// Ключевое слово, с которого должен начинаться файл
+    /// </summary>
+    private readonly string _collectionKey = "CollectionsStorage";
 
+    /// <summary>
+    /// Разделитель для записи ключа и значения элемента словаря
+    /// </summary>
     private readonly string _separatorForKeyValue = "|";
 
-    private readonly string _separatorItem = ";";
+    /// <summary>
+    /// Разделитель для записей коллекции данных в файл
+    /// </summary>
+    private readonly string _separatorItems = ";";
 
+    /// <summary>
+    /// Конструктор
+    /// </summary>
     public StorageCollection()
     {
         _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
     }
 
-   
     public void AddCollection(string name, CollectionType collectionType)
     {
         
@@ -65,34 +78,46 @@ public class StorageCollection<T>
             return _storages[name];
         }
     }
+    /// <summary>
+    /// Сохранение информации по самолетам в хранилище в файл
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    /// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
     public bool SaveData(string filename)
     {
         if (_storages.Count == 0)
         {
             return false;
         }
+
+
         if (File.Exists(filename))
         {
             File.Delete(filename);
         }
 
-        StringBuilder sb = new();
 
-        sb.Append(_collectionKey);
+
+        using FileStream fs = new(filename, FileMode.Create);
+        using StreamWriter streamWriter = new StreamWriter(fs);
+        streamWriter.Write(_collectionKey);
+
         foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
         {
-            sb.Append(Environment.NewLine);
+            streamWriter.Write(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);
+            streamWriter.Write(value.Key);
+            streamWriter.Write(_separatorForKeyValue);
+            streamWriter.Write(value.Value.GetCollectionType);
+            streamWriter.Write(_separatorForKeyValue);
+            streamWriter.Write(value.Value.MaxCount);
+            streamWriter.Write(_separatorForKeyValue);
+
 
             foreach (T? item in value.Value.GetItems())
             {
@@ -101,78 +126,69 @@ public class StorageCollection<T>
                 {
                     continue;
                 }
-                sb.Append(data);
-                sb.Append(_separatorItem);
-            }
-        }
 
-        using FileStream fs = new(filename, FileMode.Create);
-        byte[] info = new UTF8Encoding().GetBytes(sb.ToString());
-        fs.Write(info, 0, info.Length);
+
+                streamWriter.Write(data);
+                streamWriter.Write(_separatorItems);
+
+            }
+        }
         return true;
     }
-
+    /// <summary>
+    /// Загрузка информации по кораблям в хранилище из файла
+    /// </summary>
+    /// <param name="filename"></param>
+    /// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
     public bool LoadData(string filename)
     {
         if (!File.Exists(filename))
         {
             return false;
         }
-        string bufferTextFromFile = "";
-        using (FileStream fs = new(filename, FileMode.Open))
-        {
-            byte[] b = new byte[fs.Length];
-            UTF8Encoding temp = new UTF8Encoding(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.Length == 0 || strs == null)
+        using (StreamReader sr = new StreamReader(filename))
         {
+            string? str;
+            str = sr.ReadLine();
+            if (str != _collectionKey.ToString())
                 return false;
-        }
-        if (!strs[0].Equals(_collectionKey))
-        {
-            return false;
-        }
 
             _storages.Clear();
-        foreach (string data in strs)
+
+            while ((str = sr.ReadLine()) != null)
             {
-            string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                string[] record = str.Split(_separatorForKeyValue);
+
+
                 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(_separatorItem, 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 (elem?.CreateDrawningBus() is T aircraft)
                     {
+                        if (collection.Insert(aircraft) == -1)
                             return false;
                     }
                 }
-            }
 
                 _storages.Add(record[0], collection);
             }
-
+        }
         return true;
     }
-
     private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
     {
         return collectionType switch