From 8f5f82ad8b019d8e7f4eeb3d0d8d4b54ec969fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=20=D0=91=D0=BE=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BA=D0=BE?= <linkor2003@mail.ru>
Date: Sun, 13 Nov 2022 20:05:11 +0400
Subject: [PATCH] =?UTF-8?q?=D0=91=D1=83=D0=BF=20=D0=B1=D0=B8=D0=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WarmlyShip/WarmlyShip/MapsCollection.cs | 69 ++++++++++++++-----------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/WarmlyShip/WarmlyShip/MapsCollection.cs b/WarmlyShip/WarmlyShip/MapsCollection.cs
index 3b144de..6fdf7ca 100644
--- a/WarmlyShip/WarmlyShip/MapsCollection.cs
+++ b/WarmlyShip/WarmlyShip/MapsCollection.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.DirectoryServices.ActiveDirectory;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -61,13 +62,13 @@ namespace WarmlyShip
 			{
 				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;
@@ -79,37 +80,45 @@ namespace WarmlyShip
 			{
 				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 bufferStr;
+				bool firstIn = true;
+				while ((bufferStr = sr.ReadLine()) != null)
 				{
-					bufferTextFromFile += temp.GetString(b);
+					if (firstIn)
+					{
+						if (!bufferStr.Contains("MapsCollection"))
+						{
+							return false;
+						}
+						else
+						{
+							_mapStorages.Clear();
+						}
+						firstIn = false;
+					}
+					else
+					{
+						var elem = bufferStr.Split(separatorDict);
+						AbstractMap map = null;
+						switch (elem[1])
+						{
+							case "SimpleMap":
+								map = new SimpleMap();
+								break;
+							case "SecondMap":
+								map = new SecondMap();
+								break;
+							case "LastMap":
+								map = new LastMap();
+								break;
+						}
+						_mapStorages.Add(elem[0], new MapWithSetShipGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+						_mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
+					}
 				}
 			}
-			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])
-				{
-					case "SimpleMap":
-						map = new SimpleMap();
-						break;
-				}
-				_mapStorages.Add(elem[0], new MapWithSetShipGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
-				_mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
-			}
 			return true;
 		}
 	}