Лабораторная работа №6 (Доработано)

ProjectLiner/ProjectLiner/CollectionGenericObjects/ShipSharingService.cs

@@ -35,11 +35,11 @@ public class ShipSharingService : AbstractCompany
                 g.DrawLine(pen, x, y + _placeSizeHeight, x + _placeSizeWidth, y + _placeSizeHeight);
                 g.DrawLine(pen, x + _placeSizeWidth, y + _placeSizeHeight, x + _placeSizeWidth, y);
                 locCoord.Add(new Tuple<int, int>(x, y));
-                x += _placeSizeWidth + 2;
+                x += _placeSizeWidth;
             }
             countInRow = count;
-            x = 1;
+            x = 0;
-            y += _placeSizeHeight + 5;
+            y += _placeSizeHeight;
             countOfRows++;
         }
     }

ProjectLiner/ProjectLiner/CollectionGenericObjects/StorageCollection.cs

@@ -1,9 +1,7 @@
 using ProjectLiner.Drawnings;
-using System.Text;
 
 namespace ProjectLiner.CollectionGenericObjects;
 
-
 /// <summary>
 /// Класс-хранилище коллекций
 /// </summary>
@@ -11,6 +9,16 @@ namespace ProjectLiner.CollectionGenericObjects;
 public class StorageCollection<T>
     where T : DrawningShip
 {
+    /// <summary>
+    /// Словарь (хранилище) с коллекциями
+    /// </summary>
+    private Dictionary<string, ICollectionGenericObjects<T>> _storages;
+
+    /// <summary>
+    /// Возвращение списка названий коллекций
+    /// </summary>
+    public List<string> Keys => _storages.Keys.ToList();
+
     /// <summary>
     /// Ключевое слово, с которого должен начинаться файл
     /// </summary>
@@ -26,15 +34,7 @@ public class StorageCollection<T>
     /// </summary>
     private readonly string _separatorItems = ";";
 
-    /// <summary>
-    /// Словарь (хранилище) с коллекциями
-    /// </summary>
-    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
 
-    /// <summary>
-    /// Возвращение списка названий коллекций
-    /// </summary>
-    public List<string> Keys => _storages.Keys.ToList();
 
     /// <summary>
     /// Конструктор
@@ -113,49 +113,29 @@ public class StorageCollection<T>
         {
             return false;
         }
-
         if (File.Exists(filename))
         {
             File.Delete(filename);
         }
         
-        StringBuilder sb = new();
-        sb.Append(_collectionKey);
 
+        using (StreamWriter writer = new StreamWriter(filename))
+        {
+            writer.WriteLine(_collectionKey);
             foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
             {
-            sb.Append(Environment.NewLine);
+                writer.Write($"{value.Key}{_separatorForKeyValue}{value.Value.GetCollectionType}{_separatorForKeyValue}{value.Value.MaxCount}{_separatorForKeyValue}");
-
-            // не сохраняем пустые коллекции
-            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;
-
+                    if (!string.IsNullOrEmpty(data))
-                if (string.IsNullOrEmpty(data))
                     {
-                    continue;
+                        writer.Write(data + _separatorItems);
-                }
+                    }
-
+                }
-                sb.Append(data);
+                writer.WriteLine();
-                sb.Append(_separatorItems);
             }
         }
-
-        using FileStream fs = new(filename, FileMode.Create);
-        byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString());
-        fs.Write(info, 0, info.Length);
         return true;
     }
    
@@ -171,46 +151,27 @@ public class StorageCollection<T>
             return false;
         }
 
-        string bufferTextFromFile = "";
+        using (StreamReader reader = new StreamReader(filename))
-        using (FileStream fs = new(filename, FileMode.Open))
         {
-            byte[] b = new byte[fs.Length];
+            string line = reader.ReadLine();
-            UTF8Encoding temp = new(true);
+            if (line == null || !line.Equals(_collectionKey))
-
-            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)
+            while (line != null)
             {
-            string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                string[] record = line.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-
                 if (record.Length != 4)
                 {
+                    line = reader.ReadLine();
                     continue;
                 }
 
                 CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
                 ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
-
                 if (collection == null)
                 { 
                     return false; 
@@ -219,6 +180,7 @@ public class StorageCollection<T>
                 collection.MaxCount = Convert.ToInt32(record[2]);
 
                 string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+
                 foreach (string elem in set)
                 {
                     if (elem?.CreateDrawningShip() is T ship)
@@ -229,10 +191,10 @@ public class StorageCollection<T>
                         }
                     }
                 }
-
                 _storages.Add(record[0], collection);
+                line = reader.ReadLine();
+            }
         }
-
         return true;
     }