From 3e75f73a1948f6f923659de0c9705d7d027ca31b Mon Sep 17 00:00:00 2001 From: Dasha Date: Tue, 26 Dec 2023 23:00:14 +0400 Subject: [PATCH] fix --- .../Exceptions/ShipNotFoundException.cs | 19 ++++++ .../Exceptions/StorageOverflowException.cs | 19 ++++++ WarmlyShip/FormShipCollection.cs | 59 +++++++++++++------ WarmlyShip/Generics/SetGeneric.cs | 29 ++++----- WarmlyShip/Generics/ShipsGenericCollection.cs | 10 ++-- WarmlyShip/Generics/ShipsGenericStorage.cs | 16 +++-- WarmlyShip/Program.cs | 26 +++++++- WarmlyShip/WarmlyShip.csproj | 12 ++++ WarmlyShip/appsettings.json | 15 +++++ WarmlyShip/nlog.config | 13 ++++ 10 files changed, 169 insertions(+), 49 deletions(-) create mode 100644 WarmlyShip/Exceptions/ShipNotFoundException.cs create mode 100644 WarmlyShip/Exceptions/StorageOverflowException.cs create mode 100644 WarmlyShip/appsettings.json create mode 100644 WarmlyShip/nlog.config diff --git a/WarmlyShip/Exceptions/ShipNotFoundException.cs b/WarmlyShip/Exceptions/ShipNotFoundException.cs new file mode 100644 index 0000000..5cb60dc --- /dev/null +++ b/WarmlyShip/Exceptions/ShipNotFoundException.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Runtime.Serialization; + +namespace WarmlyShip.Exceptions +{ + [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/WarmlyShip/Exceptions/StorageOverflowException.cs b/WarmlyShip/Exceptions/StorageOverflowException.cs new file mode 100644 index 0000000..88750a1 --- /dev/null +++ b/WarmlyShip/Exceptions/StorageOverflowException.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyShip.Exceptions +{ + [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/WarmlyShip/FormShipCollection.cs b/WarmlyShip/FormShipCollection.cs index e7605aa..32f4758 100644 --- a/WarmlyShip/FormShipCollection.cs +++ b/WarmlyShip/FormShipCollection.cs @@ -10,6 +10,10 @@ using System.Threading.Tasks; using System.Windows.Forms; using WarmlyShip.DrawningObjects; using WarmlyShip.MovementStrategy; +using Microsoft.Extensions.Logging; +using WarmlyShip.Exceptions; +using System.Xml.Linq; +using Serilog; namespace WarmlyShip { @@ -70,6 +74,7 @@ namespace WarmlyShip } _storage.AddSet(textBoxStorageName.Text); ReloadObjects(); + Log.Information($"Добавлен набор: {textBoxStorageName.Text}"); } /// @@ -96,9 +101,10 @@ namespace WarmlyShip if (MessageBox.Show($"Удалить объект {ListBoxObjects.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - _storage.DelSet(ListBoxObjects.SelectedItem.ToString() - ?? string.Empty); + string name = (ListBoxObjects.SelectedItem.ToString() ?? string.Empty); + _storage.DelSet(name); ReloadObjects(); + Log.Information($"Удален набор: {name}"); } } @@ -121,18 +127,20 @@ namespace WarmlyShip FormShipConfig form = new(); form.Show(); - Action? shipDelegate = new((m) => + Action? shipDelegate = new((ship) => { - bool isAdditionSuccessful = (obj + m); - if (isAdditionSuccessful) + try { + bool isAdditionSuccessful = obj + ship; MessageBox.Show("Объект добавлен"); - m.ChangePictureBoxSize(pictureBoxCollection.Width, pictureBoxCollection.Height); + ship.ChangePictureBoxSize(pictureBoxCollection.Width, pictureBoxCollection.Height); pictureBoxCollection.Image = obj.ShowShips(); + Log.Information($"Добавлен объект в коллекцию {ListBoxObjects.SelectedItem.ToString() ?? string.Empty}"); } - else + catch (StorageOverflowException ex) { - MessageBox.Show("Не удалось добавить объект"); + Log.Warning($"Коллекция {ListBoxObjects.SelectedItem.ToString() ?? string.Empty} переполнена"); + MessageBox.Show(ex.Message); } }); form.AddEvent(shipDelegate); @@ -160,15 +168,23 @@ namespace WarmlyShip { return; } - int pos = Convert.ToInt32(maskedTextBoxNumber.Text); - if (obj - pos != null) + try { + int pos = Convert.ToInt32(maskedTextBoxNumber.Text); + var isAdditionSuccessful = obj - pos; MessageBox.Show("Объект удален"); + Log.Information($"Удален объект из коллекции {ListBoxObjects.SelectedItem.ToString() ?? string.Empty} по номеру {pos}"); pictureBoxCollection.Image = obj.ShowShips(); } - else + catch (ShipNotFoundException ex) { - MessageBox.Show("Не удалось удалить объект"); + Log.Warning($"Не получилось удалить объект из коллекции {ListBoxObjects.SelectedItem.ToString() ?? string.Empty}"); + MessageBox.Show(ex.Message); + } + catch (FormatException) + { + Log.Warning($"Было введено не число"); + MessageBox.Show("Введите число"); } } @@ -201,13 +217,16 @@ namespace WarmlyShip { if (saveFileDialog.ShowDialog() == DialogResult.OK) { - if (_storage.SaveData(saveFileDialog.FileName)) + try { + _storage.SaveData(saveFileDialog.FileName); MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + Log.Information($"Файл {saveFileDialog.FileName} успешно сохранен"); } - else + catch (Exception ex) { - MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + Log.Warning("Не удалось сохранить"); + MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } @@ -221,17 +240,21 @@ namespace WarmlyShip { if (openFileDialog.ShowDialog() == DialogResult.OK) { - if (_storage.LoadData(openFileDialog.FileName)) + try { + _storage.LoadData(openFileDialog.FileName); MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + Log.Information($"Файл {openFileDialog.FileName} успешно загружен"); foreach (var collection in _storage.Keys) { ListBoxObjects.Items.Add(collection); } + ReloadObjects(); } - else + catch (Exception ex) { - MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + Log.Warning("Не удалось загрузить"); + MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } diff --git a/WarmlyShip/Generics/SetGeneric.cs b/WarmlyShip/Generics/SetGeneric.cs index b368718..8cab7bb 100644 --- a/WarmlyShip/Generics/SetGeneric.cs +++ b/WarmlyShip/Generics/SetGeneric.cs @@ -1,4 +1,5 @@ -using System; +using WarmlyShip.Exceptions; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -43,15 +44,14 @@ namespace WarmlyShip.Generics /// /// Добавляемый корабль /// - public bool Insert(T ship) + public void Insert(T ship) { if (_places.Count == _maxCount) { - return false; + throw new StorageOverflowException(_maxCount); } Insert(ship, 0); - return true; } /// @@ -60,15 +60,18 @@ namespace WarmlyShip.Generics /// Добавляемый корабль /// Позиция /// - public bool Insert(T ship, int position) + public void Insert(T ship, int position) { - if (!(position >= 0 && position <= Count && _places.Count < _maxCount)) + if (_places.Count == _maxCount) { - return false; + throw new StorageOverflowException(_maxCount); + } + if (!(position >= 0 && position <= Count)) + { + throw new Exception("Неверная позиция для вставки"); } _places.Insert(position, ship); - return true; } /// @@ -76,15 +79,14 @@ namespace WarmlyShip.Generics /// /// /// - public bool Remove(int position) + public void Remove(int position) { - if (position < 0 || position >= Count) + if (!(position >= 0 && position < Count)) { - return false; + throw new ShipNotFoundException(position); } _places.RemoveAt(position); - return true; } /// @@ -96,7 +98,7 @@ namespace WarmlyShip.Generics { get { - if (position < 0 || position >= _maxCount) + if (!(position >= 0 && position < Count)) { return null; } @@ -110,7 +112,6 @@ namespace WarmlyShip.Generics } _places.Insert(position, value); - return; } } diff --git a/WarmlyShip/Generics/ShipsGenericCollection.cs b/WarmlyShip/Generics/ShipsGenericCollection.cs index 1e9aa6d..cf2e2e2 100644 --- a/WarmlyShip/Generics/ShipsGenericCollection.cs +++ b/WarmlyShip/Generics/ShipsGenericCollection.cs @@ -70,11 +70,12 @@ namespace WarmlyShip.Generics /// public static bool operator +(ShipsGenericCollection collect, T? obj) { - if (obj == null) + if (obj == null || collect == null) { return false; } - return collect?._collection.Insert(obj) ?? false; + collect?._collection.Insert(obj); + return true; } /// @@ -86,10 +87,7 @@ namespace WarmlyShip.Generics public static T? operator -(ShipsGenericCollection collect, int pos) { T? obj = collect._collection[pos]; - if (obj != null) - { - collect._collection.Remove(pos); - } + collect._collection.Remove(pos); return obj; } diff --git a/WarmlyShip/Generics/ShipsGenericStorage.cs b/WarmlyShip/Generics/ShipsGenericStorage.cs index 2d5d987..07ce10d 100644 --- a/WarmlyShip/Generics/ShipsGenericStorage.cs +++ b/WarmlyShip/Generics/ShipsGenericStorage.cs @@ -64,7 +64,7 @@ namespace WarmlyShip.Generics /// /// Путь и имя файла /// true - сохранение прошло успешно, false - ошибка при сохранении данных - public bool SaveData(string filename) + public void SaveData(string filename) { if (File.Exists(filename)) { @@ -83,7 +83,7 @@ namespace WarmlyShip.Generics if (data.Length == 0) { - return false; + throw new IOException("Невалидная операция, нет данных для сохранения"); } string toWrite = $"ShipStorage{Environment.NewLine}{data}"; var strs = toWrite.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries); @@ -95,7 +95,6 @@ namespace WarmlyShip.Generics sw.WriteLine(str); } } - return true; } /// @@ -103,11 +102,11 @@ namespace WarmlyShip.Generics /// /// Путь и имя файла /// true - загрузка прошла успешно, false - ошибка при загрузке данных - public bool LoadData(string filename) + public void LoadData(string filename) { if (!File.Exists(filename)) { - return false; + throw new IOException("Файл не найден"); } using (StreamReader sr = new(filename)) { @@ -115,11 +114,11 @@ namespace WarmlyShip.Generics var strs = str.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries); if (strs == null || strs.Length == 0) { - return false; + throw new IOException("Нет данных для загрузки"); } if (!strs[0].StartsWith("ShipStorage")) { - return false; + throw new IOException("Неверный формат данных"); } _shipStorages.Clear(); do @@ -140,7 +139,7 @@ namespace WarmlyShip.Generics { if (!(collection + ship)) { - return false; + throw new IOException("Ошибка добавления в коллекцию"); } } } @@ -149,7 +148,6 @@ namespace WarmlyShip.Generics str = sr.ReadLine(); } while (str != null); } - return true; } /// diff --git a/WarmlyShip/Program.cs b/WarmlyShip/Program.cs index 2dda87b..2e5bc60 100644 --- a/WarmlyShip/Program.cs +++ b/WarmlyShip/Program.cs @@ -1,3 +1,11 @@ +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Serilog; +using Serilog.Events; +using Serilog.Formatting.Json; +using Serilog.Configuration; + namespace WarmlyShip { internal static class Program @@ -8,9 +16,23 @@ namespace WarmlyShip [STAThread] static void Main() { - // To customize application configuration such as set high DPI settings or default font, - // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); + string[] path = Directory.GetCurrentDirectory().Split('\\'); + string pathNeed = ""; + for (int i = 0; i < path.Length - 3; i++) + { + pathNeed += path[i] + "\\"; + } + var configuration = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile(path: $"{pathNeed}appsettings.json", optional: false, reloadOnChange: true) + .Build(); + Log.Logger = new LoggerConfiguration() + .ReadFrom.Configuration(configuration) + .CreateLogger(); + Application.SetHighDpiMode(HighDpiMode.SystemAware); + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); Application.Run(new FormShipCollection()); } } diff --git a/WarmlyShip/WarmlyShip.csproj b/WarmlyShip/WarmlyShip.csproj index 7f516ba..3f63c13 100644 --- a/WarmlyShip/WarmlyShip.csproj +++ b/WarmlyShip/WarmlyShip.csproj @@ -12,4 +12,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/WarmlyShip/appsettings.json b/WarmlyShip/appsettings.json new file mode 100644 index 0000000..21a6582 --- /dev/null +++ b/WarmlyShip/appsettings.json @@ -0,0 +1,15 @@ +{ + "Serilog": { + "Using": [ "Serilog.Sinks.File" ], + "MinimumLevel": "Debug", + "WriteTo": [ + { + "Name": "File", + "Args": { "path": "log.log" } + } + ], + "Properties": { + "Application": "Sample" + } + } +} \ No newline at end of file diff --git a/WarmlyShip/nlog.config b/WarmlyShip/nlog.config new file mode 100644 index 0000000..9fc0883 --- /dev/null +++ b/WarmlyShip/nlog.config @@ -0,0 +1,13 @@ + + + + + + + + + + +