From 5ef5d78937fd3fe2f11eea57730e001361cf5c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D0=B8=D0=BD=D0=B0=20=D0=A7=D1=83=D0=B1?=
 =?UTF-8?q?=D1=8B=D0=BA=D0=B8=D0=BD=D0=B0?= <polinakill04@gmail.com>
Date: Wed, 22 Nov 2023 11:07:39 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0=206?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sailboat/Sailboat/BoatsGenericStorage.cs | 76 ++++++++++++------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/Sailboat/Sailboat/BoatsGenericStorage.cs b/Sailboat/Sailboat/BoatsGenericStorage.cs
index c282fdc..266823c 100644
--- a/Sailboat/Sailboat/BoatsGenericStorage.cs
+++ b/Sailboat/Sailboat/BoatsGenericStorage.cs
@@ -117,10 +117,10 @@ namespace Sailboat.Generics
             {
                 return false;
             }
-            using FileStream fs = new(filename, FileMode.Create);
-            byte[] info = new
-            UTF8Encoding(true).GetBytes($"BoatStorage{Environment.NewLine}{data}");
-            fs.Write(info, 0, info.Length);
+            using (StreamWriter writer = new StreamWriter(filename))
+            {
+                writer.Write($"PlaneStorage{Environment.NewLine}{data}");
+            }
             return true;
         }
         /// <summary>
@@ -134,53 +134,51 @@ namespace Sailboat.Generics
             {
                 return false;
             }
-            string bufferTextFromFile = "";
-            using (FileStream fs = new(filename, FileMode.Open))
+
+            using (StreamReader fs = File.OpenText(filename))
             {
-                byte[] b = new byte[fs.Length];
-                UTF8Encoding temp = new(true);
-                while (fs.Read(b, 0, b.Length) > 0)
+                string str = fs.ReadLine();
+                if (str == null || str.Length == 0)
                 {
-                    bufferTextFromFile += temp.GetString(b);
+                    return false;
                 }
-            }
-            var strs = bufferTextFromFile.Split(new char[] { '\n', '\r' },
-            StringSplitOptions.RemoveEmptyEntries);
-            if (strs == null || strs.Length == 0)
-            {
-                return false;
-            }
-            if (!strs[0].StartsWith("BoatStorage"))
-            {
-                //если нет такой записи, то это не те данные
-                return false;
-            }
-            _boatStorages.Clear();
-            foreach (string data in strs)
-            {
-                string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-                if (record.Length != 2)
+                if (!str.StartsWith("BoatStorage"))
                 {
-                    continue;
+                    return false;
                 }
-                BoatsGenericCollection<DrawingBoat, DrawingObjectBoat>
-                collection = new(_pictureWidth, _pictureHeight);
-                string[] set = record[1].Split(_separatorRecords,
-                StringSplitOptions.RemoveEmptyEntries);
-                foreach (string elem in set)
+
+                _boatStorages.Clear();
+                string strs = "";
+
+                while ((strs = fs.ReadLine()) != null)
                 {
-                    DrawingBoat? boat = elem?.CreateDrawingBoat(_separatorForObject, _pictureWidth, _pictureHeight);
-                    if (boat != null)
+                    if (strs == null)
                     {
-                        if (!(collection + boat))
+                        return false;
+                    }
+
+                    string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+                    if (record.Length != 2)
+                    {
+                        continue;
+                    }
+                    BoatsGenericCollection<DrawingBoat, DrawingObjectBoat> collection = new(_pictureWidth, _pictureHeight);
+                    string[] set = record[1].Split(_separatorRecords, StringSplitOptions.RemoveEmptyEntries);
+                    foreach (string elem in set)
+                    {
+                        DrawingBoat? boat = elem?.CreateDrawingBoat(_separatorForObject, _pictureWidth, _pictureHeight);
+                        if (boat != null)
                         {
-                            return false;
+                            if (!(collection + boat))
+                            {
+                                return false;
+                            }
                         }
                     }
+                    _boatStorages.Add(record[0], collection);
                 }
-                _boatStorages.Add(record[0], collection);
+                return true;
             }
-            return true;
         }
     }
 }