From c881f02fa8dffa9fbfc39b1c0fb7042b55471783 Mon Sep 17 00:00:00 2001
From: Inohara <irisha1234517@gmail.com>
Date: Wed, 16 Nov 2022 09:56:28 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BD=D0=B0=20StreamWriter=20=D0=B8=20StreamRea?=
 =?UTF-8?q?der?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AircraftCarrier/MapsCollection.cs         | 53 ++++++++-----------
 1 file changed, 22 insertions(+), 31 deletions(-)

diff --git a/AircraftCarrier/AircraftCarrier/MapsCollection.cs b/AircraftCarrier/AircraftCarrier/MapsCollection.cs
index d3c0b37..618549b 100644
--- a/AircraftCarrier/AircraftCarrier/MapsCollection.cs
+++ b/AircraftCarrier/AircraftCarrier/MapsCollection.cs
@@ -94,12 +94,12 @@ namespace AircraftCarrier
             {
                 File.Delete(filename);
             }
-            using (FileStream fs = new(filename, FileMode.Create))
+            using (StreamWriter sw = new(filename))
             {
-                WriteToFile($"MapsCollection{Environment.NewLine}", fs);
+                sw.Write($"MapsCollection{Environment.NewLine}");
                 foreach (var storage in _mapStorages)
                 {
-                    WriteToFile($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}", fs);
+                    sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
                 }
             }
             return true;
@@ -116,39 +116,30 @@ namespace AircraftCarrier
             {
                 return false;
             }
-            string bufferTextFromFile = "";
-            using (FileStream fs = new(filename, FileMode.Open))
+            using (StreamReader sr = new(filename))
             {
-                byte[] b = new byte[fs.Length];
-                UTF8Encoding temp = new(true);
-                while (fs.Read(b, 0, b.Length) > 0)
+                string str = "";
+                if ((str = sr.ReadLine()) == null || !str.Contains("MapsCollection"))
                 {
-                    bufferTextFromFile += temp.GetString(b);
+                    return false;
                 }
-            }
-            var strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
-            if (!strs[0].Contains("MapsCollection"))
-            {
-                //если нет такой записи, то это не те данные
-                return false;
-            }
-            //очищаем записи
-            _mapStorages.Clear();
-            for (int i = 1; i < strs.Length; ++i)
-            {
-                var elem = strs[i].Split(separatorDict);
-                AbstractMap map = null;
-                switch (elem[1])
+                _mapStorages.Clear();
+                while ((str = sr.ReadLine()) != null)
                 {
-                    case "Простая карта":
-                        map = new SimpleMap();
-                        break;
-                    case "Преграды-линии":
-                        map = new LineMap();
-                        break;
+                    var elem = str.Split(separatorDict);
+                    AbstractMap map = null;
+                    switch (elem[1])
+                    {
+                        case "SimpleMap":
+                            map = new SimpleMap();
+                            break;
+                        case "Преграды-линии":
+                            map = new LineMap();
+                            break;
+                    }
+                    _mapStorages.Add(elem[0], new MapWithSetWarshipsGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                    _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
                 }
-                _mapStorages.Add(elem[0], new MapWithSetWarshipsGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
-                _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
             }
             return true;
         }