diff --git a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/StorageCollection.cs b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/StorageCollection.cs index 68251fb..39a8d09 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/StorageCollection.cs @@ -106,36 +106,37 @@ public class StorageCollection { File.Delete(filename); } - using (StreamWriter writer = new StreamWriter(filename)) + StringBuilder sb = new(); + sb.Append(_collectionKey); + foreach (KeyValuePair> value in _storages) { - writer.Write(_collectionKey); - foreach (KeyValuePair> value in _storages) + sb.Append(Environment.NewLine); + // не сохраняем пустые коллекции + if (value.Value.Count == 0) { - writer.Write(Environment.NewLine); - // не сохраняем пустые коллекции - if (value.Value.Count == 0) + 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)) { continue; } - 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); - } + sb.Append(data); + sb.Append(_separatorItems); } } + using FileStream fs = new(filename, FileMode.Create); + byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString()); + fs.Write(info, 0, info.Length); return true; } @@ -150,47 +151,60 @@ public class StorageCollection { return false; } - using (StreamReader reader = File.OpenText(filename)) + string bufferTextFromFile = ""; + using (FileStream fs = new(filename, FileMode.Open)) { - string line = reader.ReadLine(); - if (line == null || line.Length == 0) + 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)) + { + //если нет такой записи, то это не те данные + 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) { return false; } - if (!line.Equals(_collectionKey)) + collection.MaxCount = Convert.ToInt32(record[2]); + string[] set = record[3].Split(_separatorItems, + StringSplitOptions.RemoveEmptyEntries); + foreach (string elem in set) { - return false; - } - _storages.Clear(); - while ((line = reader.ReadLine()) != null) - { - string[] record = line.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries); - if (record.Length != 4) + if (elem?.CreateDrawningCar() is T car) { - 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?. CreateDrawningCar() is T ship) + if (collection.Insert(car) == -1) { - if (collection.Insert(ship) == -1) - { - return false; - } + return false; } } - _storages.Add(record[0], collection); } - return true; + _storages.Add(record[0], collection); } + return true; } /// diff --git a/ProjectCleaningCar/ProjectCleaningCar/FormCleaningCarCollection.cs b/ProjectCleaningCar/ProjectCleaningCar/FormCleaningCarCollection.cs index 22693c4..94f2193 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/FormCleaningCarCollection.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/FormCleaningCarCollection.cs @@ -267,15 +267,7 @@ public partial class FormCleaningCarCollection : Form { if (openFileDialog.ShowDialog() == DialogResult.OK) { - if (_storageCollection.LoadData(openFileDialog.FileName)) - { - MessageBox.Show("Загрузка прошла успешно", "Реузльтат", MessageBoxButtons.OK, MessageBoxIcon.Information); - RerfreshListBoxItems(); - } - else - { - MessageBox.Show("Не удалось загрузить", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); - } + } } } \ No newline at end of file