From 20d212bc57961d96ebffb6491f929e7a8fb35bf5 Mon Sep 17 00:00:00 2001 From: insideq Date: Thu, 25 Apr 2024 19:16:55 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BB=20StreamWriter=20=D0=B8=20StreamReader?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StorageCollection.cs | 136 ++++++++---------- .../Drawnings/DrawningBulldozer.cs | 5 +- .../Drawnings/DrawningExcavator.cs | 4 +- .../Drawnings/ExtentionDrawningBulldozer.cs | 2 +- 4 files changed, 69 insertions(+), 78 deletions(-) diff --git a/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/StorageCollection.cs b/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/StorageCollection.cs index 3f2d9c8..8ad5434 100644 --- a/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/StorageCollection.cs @@ -112,41 +112,38 @@ public class StorageCollection 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)) + writer.Write(Environment.NewLine); + // не сохраняем пустые коллекции + if (value.Value.Count == 0) { continue; } - sb.Append(data); - sb.Append(_separatorItems); + writer.Write(value.Key); + writer.Write(_separatorForKeyValue); + writer.Write(value.Value.GetCollectionType); + writer.Write(_separatorForKeyValue); + writer.Write(value.Value.MaxCount); + writer.Write(_separatorForKeyValue); + + foreach (T? item in value.Value.GetItems()) + { + string data = item?.GetDataForSave() ?? string.Empty; + if (string.IsNullOrEmpty(data)) + { + continue; + } + + writer.Write(data); + writer.Write(_separatorItems); + } } } - - using FileStream fs = new(filename, FileMode.Create); - byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString()); - fs.Write(info, 0, info.Length); return true; } @@ -162,62 +159,55 @@ public class StorageCollection return false; } - string bufferTextFromFile = ""; - using (FileStream fs = new(filename, FileMode.Open)) + using (StreamReader reader = File.OpenText(filename)) { - byte[] b = new byte[fs.Length]; - UTF8Encoding temp = new(true); - while (fs.Read(b, 0, b.Length) > 0) - { - bufferTextFromFile += temp.GetString(b); - } - } + string str = reader.ReadLine(); - 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) - { - 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 (str == null || str.Length == 0) { return false; } - collection.MaxCount = Convert.ToInt32(record[2]); - - string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); - foreach (string elem in set) + if (!str.StartsWith(_collectionKey)) { - if (elem?.CreateDrawningBulldozer() is T bulldozer) - { - if (collection.Insert(bulldozer) == - 1) - { - return false; - } - } + //если нет такой записи, то это не те данные + return false; } - _storages.Add(record[0], collection); - } + _storages.Clear(); + string strs = ""; + while ((strs = reader.ReadLine()) != null) + { + string[] record = strs.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) + { + return false; + } + + collection.MaxCount = Convert.ToInt32(record[2]); + + string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); + foreach (string elem in set) + { + if (elem?.CreateDrawningBulldozer() is T bulldozer) + { + if (collection.Insert(bulldozer) == -1) + { + return false; + } + } + } + + _storages.Add(record[0], collection); + } + } return true; } diff --git a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs index 1cae0b6..06e38da 100644 --- a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs +++ b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningBulldozer.cs @@ -1,4 +1,5 @@ using ProjectExcavator.Entities; +using System.Security.Policy; namespace ProjectExcavator.Drawnings; @@ -99,9 +100,9 @@ public class DrawningBulldozer /// Конструктор, принимающий объект EntityBulldozer в качестве параметра /// /// - public DrawningBulldozer(EntityBulldozer entityBulldozer) + public DrawningBulldozer(EntityBulldozer bull) : this() { - EntityBulldozer = entityBulldozer; + EntityBulldozer = new EntityBulldozer(bull.Speed, bull.Weight, bull.BodyColor); } /// diff --git a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs index 36a68b5..fd49b1e 100644 --- a/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs +++ b/ProjectExcavator/ProjectExcavator/Drawnings/DrawningExcavator.cs @@ -25,9 +25,9 @@ public class DrawningExcavator : DrawningBulldozer /// Конструктор, принимающий объект EntityBulldozer в качестве параметра /// /// - public DrawningExcavator(EntityBulldozer entityBulldozer) + public DrawningExcavator(EntityExcavator exc) : base(150, 80) { - EntityBulldozer = entityBulldozer; + EntityBulldozer = new EntityExcavator(exc.Speed, exc.Weight, exc.BodyColor, exc.AdditionalColor, exc.Prop, exc.Ladle); } public override void DrawTransport(Graphics g) diff --git a/ProjectExcavator/ProjectExcavator/Drawnings/ExtentionDrawningBulldozer.cs b/ProjectExcavator/ProjectExcavator/Drawnings/ExtentionDrawningBulldozer.cs index 77c4852..96f4dc0 100644 --- a/ProjectExcavator/ProjectExcavator/Drawnings/ExtentionDrawningBulldozer.cs +++ b/ProjectExcavator/ProjectExcavator/Drawnings/ExtentionDrawningBulldozer.cs @@ -23,7 +23,7 @@ public static class ExtentionDrawningBulldozer EntityBulldozer? bulldozer = EntityExcavator.CreateEntityExcavator(strs); if (bulldozer != null) { - return new DrawningExcavator(bulldozer); + return new DrawningExcavator((EntityExcavator)bulldozer); } bulldozer = EntityBulldozer.CreateEntityBulldozer(strs);