From 4ab74bde46ed8af3d4920370534b111127b8a3fd Mon Sep 17 00:00:00 2001 From: ksenianeva <95441235+ksenianeva@users.noreply.github.com> Date: Fri, 2 Dec 2022 00:04:23 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=BE=D0=B3=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContainerShip/ContainerShip.csproj | 24 +++++++++++ .../ContainerShip/FormMapWithSetShips.cs | 40 +++++++++++++------ .../ContainerShip/MapWithSetShipsGeneric.cs | 2 +- ContainerShip/ContainerShip/MapsCollection.cs | 14 +++---- ContainerShip/ContainerShip/Program.cs | 27 ++++++++++++- .../ContainerShip/SetShipsGeneric.cs | 8 ++-- .../ContainerShip/ShipNotFoundException.cs | 9 ++++- .../ContainerShip/StorageOverflowException.cs | 9 ++++- ContainerShip/ContainerShip/appsettings.json | 24 +++++++++++ 9 files changed, 131 insertions(+), 26 deletions(-) create mode 100644 ContainerShip/ContainerShip/appsettings.json diff --git a/ContainerShip/ContainerShip/ContainerShip.csproj b/ContainerShip/ContainerShip/ContainerShip.csproj index 13ee123..f7fe2a1 100644 --- a/ContainerShip/ContainerShip/ContainerShip.csproj +++ b/ContainerShip/ContainerShip/ContainerShip.csproj @@ -8,6 +8,30 @@ enable + + + + + + + Always + + + + + + + + + + + + + + + + + True diff --git a/ContainerShip/ContainerShip/FormMapWithSetShips.cs b/ContainerShip/ContainerShip/FormMapWithSetShips.cs index 97ba096..b35292a 100644 --- a/ContainerShip/ContainerShip/FormMapWithSetShips.cs +++ b/ContainerShip/ContainerShip/FormMapWithSetShips.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using static System.Windows.Forms.DataFormats; +using Microsoft.Extensions.Logging; namespace ContainerShip { @@ -28,9 +29,14 @@ namespace ContainerShip /// /// Конструктор /// - public FormMapWithSetShips() + /// /// + /// Логер + /// + private readonly ILogger _logger; + public FormMapWithSetShips(ILogger logger) { InitializeComponent(); + _logger = logger; _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height); ComboBoxSelectorMap.Items.Clear(); foreach (var elem in _mapsDict) @@ -97,14 +103,21 @@ namespace ContainerShip return; } int pos = Convert.ToInt32(maskedTextBoxPosition.Text); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null) + try { - MessageBox.Show("Объект удален"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null) + { + MessageBox.Show("Объект удален"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } } - else + catch (ShipNotFoundException ex) { - MessageBox.Show("Не удалось удалить объект"); + MessageBox.Show($"Ошибка удаления: {ex.Message}"); + } + catch (Exception ex) + { + MessageBox.Show($"Неизвестная ошибка: {ex.Message}") ; } } /// @@ -179,6 +192,7 @@ namespace ContainerShip } _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[ComboBoxSelectorMap.Text]); ReloadMaps(); + _logger.LogInformation($"Добавлена карта {textBoxNewMapName.Text}"); } /// /// Выбор карты @@ -212,13 +226,14 @@ namespace ContainerShip { if (saveFileDialog.ShowDialog() == DialogResult.OK) { - if (_mapsCollection.SaveData(saveFileDialog.FileName)) + try { + _mapsCollection.SaveData(saveFileDialog.FileName); MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); } - else + catch (Exception ex) { - MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } @@ -227,14 +242,15 @@ namespace ContainerShip { if (openFileDialog.ShowDialog() == DialogResult.OK) { - if (_mapsCollection.LoadData(openFileDialog.FileName)) + try { + _mapsCollection.LoadData(openFileDialog.FileName); MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); ReloadMaps(); } - else + catch (Exception ex) { - MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } diff --git a/ContainerShip/ContainerShip/MapWithSetShipsGeneric.cs b/ContainerShip/ContainerShip/MapWithSetShipsGeneric.cs index d87b334..4afb290 100644 --- a/ContainerShip/ContainerShip/MapWithSetShipsGeneric.cs +++ b/ContainerShip/ContainerShip/MapWithSetShipsGeneric.cs @@ -71,7 +71,7 @@ namespace ContainerShip foreach (var ship in _setShips.GetShips()) { return _map.CreateMap(_pictureWidth, _pictureHeight, ship); - } + } return new(_pictureWidth, _pictureHeight); } public string GetData(char separatorType, char separatorData) diff --git a/ContainerShip/ContainerShip/MapsCollection.cs b/ContainerShip/ContainerShip/MapsCollection.cs index 6eadab9..605ca47 100644 --- a/ContainerShip/ContainerShip/MapsCollection.cs +++ b/ContainerShip/ContainerShip/MapsCollection.cs @@ -104,7 +104,7 @@ namespace ContainerShip /// /// Путь и имя файла /// - public bool SaveData(string filename) + public void SaveData(string filename) { if (File.Exists(filename)) { @@ -119,19 +119,17 @@ namespace ContainerShip sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}", sw); } } - return true; } - /// /// Загрузка нформации по автомобилям на парковках из файла /// /// /// - public bool LoadData(string filename) + public void LoadData(string filename) { if (!File.Exists(filename)) { - return false; + throw new Exception("Файл не найден"); } using (FileStream fs = new(filename, FileMode.Open)) using (StreamReader sr = new StreamReader(fs)) @@ -139,7 +137,10 @@ namespace ContainerShip string line; line = sr.ReadLine(); line.Trim(); - if (line != "MapsCollection") return false; + if (line != "MapsCollection") + { + throw new Exception("Неправильный формат данных в файле"); + } _mapStorages.Clear(); while ((line = sr.ReadLine()) != null) { @@ -158,7 +159,6 @@ namespace ContainerShip _mapStorages.Add(elem[0], new MapWithSetShipsGeneric(_pictureWidth, _pictureHeight, map)); _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries)); } - return true; } } } diff --git a/ContainerShip/ContainerShip/Program.cs b/ContainerShip/ContainerShip/Program.cs index d579063..af64b50 100644 --- a/ContainerShip/ContainerShip/Program.cs +++ b/ContainerShip/ContainerShip/Program.cs @@ -1,3 +1,8 @@ +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Serilog; +using Serilog.Extensions.Logging; namespace ContainerShip { internal static class Program @@ -11,7 +16,27 @@ namespace ContainerShip // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormMapWithSetShips()); + var services = new ServiceCollection(); + ConfigureServices(services); + using (ServiceProvider serviceProvider = services.BuildServiceProvider()) + { + Application.Run(serviceProvider.GetRequiredService()); + } + } + + private static void ConfigureServices(ServiceCollection services) + { + services.AddSingleton() + .AddLogging(option => + { + option.SetMinimumLevel(LogLevel.Information); + var configuration = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json") + .Build(); + Serilog.Log.Logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger(); + option.AddSerilog(); + }); } } } \ No newline at end of file diff --git a/ContainerShip/ContainerShip/SetShipsGeneric.cs b/ContainerShip/ContainerShip/SetShipsGeneric.cs index cb778d4..196ab35 100644 --- a/ContainerShip/ContainerShip/SetShipsGeneric.cs +++ b/ContainerShip/ContainerShip/SetShipsGeneric.cs @@ -44,8 +44,10 @@ namespace ContainerShip /// public int Insert(T ship, int position) { - if (position < 0 || position >= _maxCount) return -1; - if (_places.Count + 1 >= _maxCount) return -1; + if (position < 0 || position >= _maxCount || _places.Count + 1 >= _maxCount) + { + throw new StorageOverflowException(_maxCount); + } _places.Add(ship); return position; } @@ -58,7 +60,7 @@ namespace ContainerShip { if (position < 0 || position >= _maxCount) { - return null; + throw new ShipNotFoundException(position); } T ship = _places[position]; _places.RemoveAt(position); diff --git a/ContainerShip/ContainerShip/ShipNotFoundException.cs b/ContainerShip/ContainerShip/ShipNotFoundException.cs index 2f5c52c..88d5e98 100644 --- a/ContainerShip/ContainerShip/ShipNotFoundException.cs +++ b/ContainerShip/ContainerShip/ShipNotFoundException.cs @@ -1,12 +1,19 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace ContainerShip { - internal class ShipNotFoundException + [Serializable] + internal class ShipNotFoundException : ApplicationException { + public ShipNotFoundException(int i) : base($"Не найден объект по позиции {i}") { } + public ShipNotFoundException() : base() { } + public ShipNotFoundException(string message) : base(message) { } + public ShipNotFoundException(string message, Exception exception) : base(message, exception) { } + protected ShipNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { } } } diff --git a/ContainerShip/ContainerShip/StorageOverflowException.cs b/ContainerShip/ContainerShip/StorageOverflowException.cs index 4ea92bb..1ebac1f 100644 --- a/ContainerShip/ContainerShip/StorageOverflowException.cs +++ b/ContainerShip/ContainerShip/StorageOverflowException.cs @@ -1,12 +1,19 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace ContainerShip { - internal class StorageOverflowException + [Serializable] + internal class StorageOverflowException : ApplicationException { + public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: {count}") { } + public StorageOverflowException() : base() { } + public StorageOverflowException(string message) : base(message) { } + public StorageOverflowException(string message, Exception exception) : base(message, exception) { } + protected StorageOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { } } } diff --git a/ContainerShip/ContainerShip/appsettings.json b/ContainerShip/ContainerShip/appsettings.json new file mode 100644 index 0000000..ad4b089 --- /dev/null +++ b/ContainerShip/ContainerShip/appsettings.json @@ -0,0 +1,24 @@ +{ + "exclude": [ + "/bin", + "/bower_components", + "/jspm_packages", + "/node_modules", + "/obj", + "/platforms" + ], + "Serilog": { + "Using": [ "Serilog.Sinks.File" ], + "MinimumLevel": "Debug", + "WriteTo": [ + { + "Name": "File", + "Args": { "path": "Logs/log.txt" } + } + ], + "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ], + "Properties": { + "Application": "Sample" + } + } +} \ No newline at end of file