From bfce6b7fbd83c95e3bd9a300051a38fb5aa5ff31 Mon Sep 17 00:00:00 2001 From: ENDORFIT Date: Mon, 22 Apr 2024 14:16:17 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=966=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StorageCollection.cs | 128 ++++++++---------- 1 file changed, 60 insertions(+), 68 deletions(-) diff --git a/ProjectMonorail/Scripts/Monorail/CollectionGenericObjects/StorageCollection.cs b/ProjectMonorail/Scripts/Monorail/CollectionGenericObjects/StorageCollection.cs index 8c17858..e36483b 100644 --- a/ProjectMonorail/Scripts/Monorail/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectMonorail/Scripts/Monorail/CollectionGenericObjects/StorageCollection.cs @@ -1,5 +1,4 @@ using ProjectMonorail.Scripts.Monorail.Drawnings; -using System.Diagnostics; using System.Text; namespace ProjectMonorail.Scripts.Monorail.CollectionGenericObjects @@ -115,38 +114,40 @@ namespace ProjectMonorail.Scripts.Monorail.CollectionGenericObjects { File.Delete(filename); } - StringBuilder sb = new(); - sb.Append(_collectionKey); - foreach (KeyValuePair> value in - _storages) + using (StreamWriter writer = new StreamWriter(filename)) { - sb.Append(Environment.NewLine); - // не сохраняем пустые коллекции - if (value.Value.Count == 0) + writer.Write(_collectionKey); + foreach (KeyValuePair> value in _storages) { - 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)) + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.Append(Environment.NewLine); + + if (value.Value.Count == 0) { continue; } - sb.Append(data); - sb.Append(_separatorItems); + + stringBuilder.Append(value.Key); + stringBuilder.Append(_separatorForKeyValue); + stringBuilder.Append(value.Value.GetCollectionType); + stringBuilder.Append(_separatorForKeyValue); + stringBuilder.Append(value.Value.MaxCount); + stringBuilder.Append(_separatorForKeyValue); + + foreach (T? item in value.Value.GetItems()) + { + string data = item?.GetDataForSave() ?? string.Empty; + if (string.IsNullOrEmpty(data)) + { + continue; + } + stringBuilder.Append(data); + stringBuilder.Append(_separatorItems); + } + writer.Write(stringBuilder); } + return true; } - using FileStream fs = new(filename, FileMode.Create); - byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString()); - fs.Write(info, 0, info.Length); - return true; } /// @@ -160,61 +161,52 @@ namespace ProjectMonorail.Scripts.Monorail.CollectionGenericObjects { return false; } - string bufferTextFromFile = ""; - using (FileStream fs = new(filename, FileMode.Open)) - { - byte[] b = new byte[fs.Length]; - UTF8Encoding temp = new(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 == null || strs.Length == 0) - { - return false; - } - if (!strs[0].Equals(_collectionKey)) + using (StreamReader streamRader = File.OpenText(filename)) { - //если нет такой записи, то это не те данные - return false; - } + string inputString = streamRader.ReadLine(); - _storages.Clear(); - foreach (string data in strs) - { - string[] record = data.Split(_separatorForKeyValue, - StringSplitOptions.RemoveEmptyEntries); - if (record.Length != 4) - { - continue; - } - CollectionType collectionType = - (CollectionType)Enum.Parse(typeof(CollectionType), record[1]); - ICollectionGenericObjects? collection = - StorageCollection.CreateCollection(collectionType); - if (collection == null) + if (inputString == null || inputString.Length == 0) { return false; } - collection.MaxCount = Convert.ToInt32(record[2]); - string[] set = record[3].Split(_separatorItems, - StringSplitOptions.RemoveEmptyEntries); - foreach (string elem in set) + + if (!inputString.StartsWith(_collectionKey)) { - if (elem?.CreateDrawingMonorail() is T monorail) + return false; + } + + _storages.Clear(); + string strs = ""; + while ((strs = streamRader.ReadLine()) != null) + { + string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries); + if (record.Length != 4) { - if (collection.Insert(monorail) == -1) + continue; + } + CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]); + ICollectionGenericObjects? collection = StorageCollection.CreateCollection(collectionType); + if (collection == null) + { + return false; + } + collection.MaxCount = Convert.ToInt32(record[2]); + string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); + foreach (string elem in set) + { + if (elem?.CreateDrawingMonorail() is T ship) { - return false; + if (collection.Insert(ship) == -1) + { + return false; + } } } + _storages.Add(record[0], collection); } - _storages.Add(record[0], collection); + return true; } - return true; } private static ICollectionGenericObjects? CreateCollection(CollectionType collectionType)