diff --git a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ListGenericObjects.cs b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ListGenericObjects.cs index 2bcc227..dbc59ed 100644 --- a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ListGenericObjects.cs @@ -1,4 +1,6 @@ -namespace ProjectAirbus.CollectionGenericObjects; +using ProjectAirbus.Exceptions; + +namespace ProjectAirbus.CollectionGenericObjects; /// /// Параметризованный набор объектов @@ -44,7 +46,7 @@ public class ListGenericObjects : ICollectionGenericObjects where T : clas // TODO проверка позиции if (position < 0 || position >= Count) { - return null; + throw new PositionOutOfCollectionException(position); } return _collection[position]; @@ -54,7 +56,7 @@ public class ListGenericObjects : ICollectionGenericObjects where T : clas { if (Count == _maxCount) { - return -1; + throw new CollectionOverflowException(Count); } _collection.Add(obj); return Count; @@ -64,11 +66,11 @@ public class ListGenericObjects : ICollectionGenericObjects where T : clas { if (Count == _maxCount) { - return -1; + throw new CollectionOverflowException(Count); } if (position >= Count || position < 0) { - return -1; + throw new PositionOutOfCollectionException(position); } _collection.Insert(position, obj); return position; @@ -78,7 +80,7 @@ public class ListGenericObjects : ICollectionGenericObjects where T : clas { if (position >= Count || position < 0) { - return null; + throw new PositionOutOfCollectionException(position); } T obj = _collection[position]; _collection.RemoveAt(position); diff --git a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/MassiveGenericObjects.cs index 42baffd..ff6958f 100644 --- a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/MassiveGenericObjects.cs @@ -1,4 +1,6 @@ -namespace ProjectAirbus.CollectionGenericObjects; +using ProjectAirbus.Exceptions; + +namespace ProjectAirbus.CollectionGenericObjects; public class MassiveGenericObjects : ICollectionGenericObjects where T : class { @@ -44,11 +46,14 @@ public class MassiveGenericObjects : ICollectionGenericObjects where T : c public T? Get(int position) { // TODO проверка позиции - if (position < 0 || position > Count) + if (position < 0 || position >= Count) { - return null; + throw new PositionOutOfCollectionException(position); + } + if (_collection[position] == null) + { + //throw new ObjectNotFoundException(position); } - return _collection[position]; } @@ -64,7 +69,7 @@ public class MassiveGenericObjects : ICollectionGenericObjects where T : c } } - return -1; + throw new CollectionOverflowException(Count); } public int Insert(T obj, int position) @@ -77,7 +82,7 @@ public class MassiveGenericObjects : ICollectionGenericObjects where T : c // TODO вставка if (position < 0 || position >= Count) { - return -1; + throw new PositionOutOfCollectionException(position); } if (_collection[position] == null) @@ -106,7 +111,7 @@ public class MassiveGenericObjects : ICollectionGenericObjects where T : c } } - return -1; + throw new CollectionOverflowException(Count); } public T Remove(int position) @@ -116,10 +121,14 @@ public class MassiveGenericObjects : ICollectionGenericObjects where T : c // присвоив элементу массива значение null if (position >= Count || position < 0) { - return null; + throw new PositionOutOfCollectionException(position); } - T obj = _collection[position]; + T? obj = _collection[position]; + if (obj == null) + { + throw new ObjectNotFoundException(position); + } _collection[position] = null; return obj; } diff --git a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs index 8011a01..4a2fb78 100644 --- a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs @@ -1,4 +1,5 @@ using ProjectAirbus.Drawnings; +using ProjectAirbus.Exceptions; using System.Text; namespace ProjectAirbus.CollectionGenericObjects; @@ -98,12 +99,11 @@ public class StorageCollection where T : DrawningAirbus /// Сохранение информации по автомобилям в хранилище в файл /// /// Путь и имя файла - /// true - сохранение прошло успешно, false - ошибка при сохранение данных - public bool SaveData(string filename) + public void SaveData(string filename) { if (_storages.Count == 0) { - return false; + throw new Exception("В хранилище отсутствуют коллекции для сохранения"); } if (File.Exists(filename)) @@ -146,22 +146,18 @@ public class StorageCollection where T : DrawningAirbus writer.Write(sb); } - } - - return true; } /// /// Загрузка информации по автомобилям в хранилище из файла /// /// Путь и имя файла - /// true - загрузка прошла успешно, false - ошибка при загрузке данных - public bool LoadData(string filename) + public void LoadData(string filename) { if (!File.Exists(filename)) { - return false; + throw new FileNotFoundException("Файл не существует"); } using (StreamReader fs = File.OpenText(filename)) @@ -170,12 +166,12 @@ public class StorageCollection where T : DrawningAirbus if (str == null || str.Length == 0) { - return false; + throw new IOException("В файле нет данных"); } if (!str.StartsWith(_collectionKey)) { - return false; + throw new IOException("В файле неверные данные"); } _storages.Clear(); @@ -189,12 +185,8 @@ public class StorageCollection where T : DrawningAirbus } CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]); - ICollectionGenericObjects? collection = StorageCollection.CreateCollection(collectionType); - if (collection == null) - { - return false; - } - + ICollectionGenericObjects? collection = StorageCollection.CreateCollection(collectionType) ?? + throw new Exception("Не удалось определить тип коллекции: " + record[1]); collection.MaxCount = Convert.ToInt32(record[2]); string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); @@ -202,15 +194,21 @@ public class StorageCollection where T : DrawningAirbus { if (elem?.CreateDrawningAirbus() is T airbus) { - if (collection.Insert(airbus) == -1) + try { - return false; + if (collection.Insert(airbus) == -1) + { + throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]); + } + } + catch (CollectionOverflowException ex) + { + throw new Exception("Коллекция переполнена", ex); } } } _storages.Add(record[0], collection); } - return true; } } diff --git a/ProjectAirbus/ProjectAirbus/Exceptions/CollectionOverflowException.cs b/ProjectAirbus/ProjectAirbus/Exceptions/CollectionOverflowException.cs new file mode 100644 index 0000000..96e7595 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/Exceptions/CollectionOverflowException.cs @@ -0,0 +1,20 @@ +using System.Runtime.Serialization; + +namespace ProjectAirbus.Exceptions; + +/// +/// Класс, описывающий ошибку переполнения коллекции +/// +[Serializable] +internal class CollectionOverflowException : ApplicationException +{ + public CollectionOverflowException(int Count) : base("В коллекции превышено допустимое количество: " + Count) { } + + public CollectionOverflowException() : base() { } + + public CollectionOverflowException(string Message) : base(Message) { } + + public CollectionOverflowException(string message, Exception exception) : base(message, exception) { } + + protected CollectionOverflowException(SerializationInfo info, StreamingContext context) : base(info, context) { } +} diff --git a/ProjectAirbus/ProjectAirbus/Exceptions/ObjectNotFoundException.cs b/ProjectAirbus/ProjectAirbus/Exceptions/ObjectNotFoundException.cs new file mode 100644 index 0000000..d13a811 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/Exceptions/ObjectNotFoundException.cs @@ -0,0 +1,20 @@ +using System.Runtime.Serialization; + +namespace ProjectAirbus.Exceptions; + +/// +/// Класс, описывающий ошибку, что по указанной позиции нет элемента +/// +[Serializable] +internal class ObjectNotFoundException : ApplicationException +{ + public ObjectNotFoundException(int i) : base("Не найден объект по позиции " + i) { } + + public ObjectNotFoundException() : base() { } + + public ObjectNotFoundException(string message) : base(message) { } + + public ObjectNotFoundException(string message, Exception exception) : base(message, exception) { } + + protected ObjectNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) { } +} diff --git a/ProjectAirbus/ProjectAirbus/Exceptions/PositionOutOfCollectionException.cs b/ProjectAirbus/ProjectAirbus/Exceptions/PositionOutOfCollectionException.cs new file mode 100644 index 0000000..e1c303a --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/Exceptions/PositionOutOfCollectionException.cs @@ -0,0 +1,20 @@ +using System.Runtime.Serialization; + +namespace ProjectAirbus.Exceptions; + +/// +/// Класс, описывающий ошибку выхода за границы коллекции +/// +[Serializable] +internal class PositionOutOfCollectionException : ApplicationException +{ + public PositionOutOfCollectionException(int i) : base("Выход за границы коллекции. Позиция " + i) { } + + public PositionOutOfCollectionException() : base() { } + + public PositionOutOfCollectionException(string message) : base(message) { } + + public PositionOutOfCollectionException(string message, Exception exception) : base(message, exception) { } + + protected PositionOutOfCollectionException(SerializationInfo info, StreamingContext context) : base(info, context) { } +} diff --git a/ProjectAirbus/ProjectAirbus/FormAirbusCollection.cs b/ProjectAirbus/ProjectAirbus/FormAirbusCollection.cs index 9012b97..db08539 100644 --- a/ProjectAirbus/ProjectAirbus/FormAirbusCollection.cs +++ b/ProjectAirbus/ProjectAirbus/FormAirbusCollection.cs @@ -1,5 +1,7 @@ -using ProjectAirbus.CollectionGenericObjects; +using Microsoft.Extensions.Logging; +using ProjectAirbus.CollectionGenericObjects; using ProjectAirbus.Drawnings; +using ProjectAirbus.Exceptions; namespace ProjectAirbus; @@ -18,13 +20,20 @@ public partial class FormAirbusCollection : Form /// private AbstractCompany? _company = null; + /// + /// Логер + /// + private readonly ILogger _logger; + /// /// Конструктор /// - public FormAirbusCollection() + public FormAirbusCollection(ILogger logger) { InitializeComponent(); _storageCollection = new(); + _logger = logger; + _logger.LogInformation("Форма создалась"); } /// @@ -56,19 +65,25 @@ public partial class FormAirbusCollection : Form /// private void SetAirbus(DrawningAirbus airbus) { - if (_company == null || airbus == null) + try { - return; - } + if (_company == null || airbus == null) + { + return; + } - if (_company + airbus != -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _company.Show(); + if (_company + airbus != -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _company.Show(); + _logger.LogInformation("Добавлен объект: " + airbus.GetDataForSave()); + } } - else + catch (ObjectNotFoundException ex) { } + catch (CollectionOverflowException ex) { - MessageBox.Show("Не удалось добавить объект"); + MessageBox.Show(ex.Message); + _logger.LogError("Ошибка: {Message}", ex.Message); } } @@ -90,14 +105,19 @@ public partial class FormAirbusCollection : Form } int pos = Convert.ToInt32(maskedTextBoxPosition.Text); - if (_company - pos != null) + try { - MessageBox.Show("Объект удален"); - pictureBox.Image = _company.Show(); + if (_company - pos != null) + { + MessageBox.Show("Объект удален"); + pictureBox.Image = _company.Show(); + _logger.LogInformation("Удален объект по позиции " + pos); + } } - else + catch (Exception ex) { - MessageBox.Show("Не удалось удалить объект"); + MessageBox.Show(ex.Message); + _logger.LogError("Ошибка: {Message}", ex.Message); } } @@ -115,26 +135,33 @@ public partial class FormAirbusCollection : Form DrawningAirbus? airbus = null; int counter = 100; - while (airbus == null) + try { - airbus = _company.GetRandomObject(); - counter--; - if (counter <= 0) + while (airbus == null) { - break; + airbus = _company.GetRandomObject(); + counter--; + if (counter <= 0) + { + break; + } } - } - if (airbus == null) - { - return; - } + if (airbus == null) + { + return; + } - FormAirbus form = new() + FormAirbus form = new() + { + SetAirbus = airbus + }; + form.ShowDialog(); + } + catch (Exception ex) { - SetAirbus = airbus - }; - form.ShowDialog(); + MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } /// @@ -164,19 +191,26 @@ public partial class FormAirbusCollection : Form MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - - CollectionType collectionType = CollectionType.None; - if (radioButtonMassive.Checked) + try { - collectionType = CollectionType.Massive; - } - else if (radioButtonList.Checked) - { - collectionType = CollectionType.List; - } + CollectionType collectionType = CollectionType.None; + if (radioButtonMassive.Checked) + { + collectionType = CollectionType.Massive; + } + else if (radioButtonList.Checked) + { + collectionType = CollectionType.List; + } - _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType); - RefreshListBoxItems(); + _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType); + RefreshListBoxItems(); + _logger.LogInformation("Коллекция добавлена " + textBoxCollectionName.Text); + } + catch (Exception ex) + { + _logger.LogError("Ошибка: {Message}", ex.Message); + } } /// @@ -191,15 +225,21 @@ public partial class FormAirbusCollection : Form MessageBox.Show("Коллекция не выбрана"); return; } - - if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + try { - return; + if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + + _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString()); + _logger.LogInformation("Коллекция " + listBoxCollection.SelectedItem.ToString() + " удалена"); + RefreshListBoxItems(); + } + catch (Exception ex) + { + _logger.LogError("Ошибка: {Message}", ex.Message); } - - _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString()); - RefreshListBoxItems(); - } /// @@ -258,13 +298,16 @@ public partial class FormAirbusCollection : Form { if (saveFileDialog.ShowDialog() == DialogResult.OK) { - if (_storageCollection.SaveData(saveFileDialog.FileName)) + try { + _storageCollection.SaveData(saveFileDialog.FileName); MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName); } - else + catch (Exception ex) { - MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogError("Ошибка: {Message}", ex.Message); } } } @@ -278,13 +321,16 @@ public partial class FormAirbusCollection : Form { if (openFileDialog.ShowDialog() == DialogResult.OK) { - if (_storageCollection.LoadData(openFileDialog.FileName)) + try { + _storageCollection.LoadData(openFileDialog.FileName); MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName); } - else + catch (Exception ex) { MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogError("Ошибка: {Message}", ex.Message); } } RefreshListBoxItems(); diff --git a/ProjectAirbus/ProjectAirbus/Program.cs b/ProjectAirbus/ProjectAirbus/Program.cs index 99a94bc..32fbaa8 100644 --- a/ProjectAirbus/ProjectAirbus/Program.cs +++ b/ProjectAirbus/ProjectAirbus/Program.cs @@ -1,3 +1,8 @@ +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Serilog; + namespace ProjectAirbus { internal static class Program @@ -11,7 +16,34 @@ namespace ProjectAirbus // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormAirbusCollection()); + ServiceCollection services = new(); + ConfigureServices(services); + using ServiceProvider serviceProvider = services.BuildServiceProvider(); + Application.Run(serviceProvider.GetRequiredService()); + } + + /// + /// DI + /// + /// + private static void ConfigureServices(ServiceCollection services) + { + // services.AddSingleton() + //.AddLogging(option => + //{ + // option.SetMinimumLevel(LogLevel.Information); + // option.AddNLog("nlog.config"); + //}); + services.AddSingleton() + .AddLogging(option => + { + option.SetMinimumLevel(LogLevel.Information); + option.AddSerilog(new LoggerConfiguration() + .ReadFrom.Configuration(new ConfigurationBuilder() + .AddJsonFile("serilog.json") + .Build()) + .CreateLogger()); + }); } } } \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/ProjectAirbus.csproj b/ProjectAirbus/ProjectAirbus/ProjectAirbus.csproj index edfd4f7..1ddb075 100644 --- a/ProjectAirbus/ProjectAirbus/ProjectAirbus.csproj +++ b/ProjectAirbus/ProjectAirbus/ProjectAirbus.csproj @@ -9,9 +9,15 @@ - - - + + + + + + + + + @@ -29,4 +35,10 @@ + + + Always + + + \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/serilog.json b/ProjectAirbus/ProjectAirbus/serilog.json new file mode 100644 index 0000000..9e8580e --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/serilog.json @@ -0,0 +1,18 @@ +{ + "Serilog": { + "Using": [ "Serilog.Sinks.File" ], + "MinimumLevel": "Information", + "WriteTo": [ + { + "Name": "File", + "Args": { + "path": "log.log", + "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}" + } + } + ], + "Properties": { + "Application": "Airbus" + } + } +}