diff --git a/Sailboat/Sailboat/BoatNotFoundException.cs b/Sailboat/Sailboat/BoatNotFoundException.cs
new file mode 100644
index 0000000..e068a36
--- /dev/null
+++ b/Sailboat/Sailboat/BoatNotFoundException.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 Sailboat.Exceptions
+{
+ [Serializable]
+ internal class BoatNotFoundException : ApplicationException
+ {
+ public BoatNotFoundException(int i) : base($"Не найден объект по позиции { i}") { }
+ public BoatNotFoundException() : base() { }
+ public BoatNotFoundException(string message) : base(message) { }
+ public BoatNotFoundException(string message, Exception exception) :base(message, exception) { }
+ protected BoatNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+ }
+}
diff --git a/Sailboat/Sailboat/BoatsGenericCollection.cs b/Sailboat/Sailboat/BoatsGenericCollection.cs
index 4736a47..9c5176d 100644
--- a/Sailboat/Sailboat/BoatsGenericCollection.cs
+++ b/Sailboat/Sailboat/BoatsGenericCollection.cs
@@ -71,14 +71,11 @@ namespace Sailboat.Generics
///
///
///
- public static bool operator -(BoatsGenericCollection collect, int pos)
+ public static T? operator -(BoatsGenericCollection collect, int pos)
{
T? obj = collect._collection[pos];
- if (obj != null)
- {
- collect._collection.Remove(pos);
- }
- return false;
+ collect._collection.Remove(pos);
+ return obj;
}
///
diff --git a/Sailboat/Sailboat/BoatsGenericStorage.cs b/Sailboat/Sailboat/BoatsGenericStorage.cs
index 266823c..a730d37 100644
--- a/Sailboat/Sailboat/BoatsGenericStorage.cs
+++ b/Sailboat/Sailboat/BoatsGenericStorage.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Sailboat.DrawingObjects;
using Sailboat.MovementStrategy;
+using Sailboat.Exceptions;
namespace Sailboat.Generics
{
@@ -46,8 +47,7 @@ namespace Sailboat.Generics
///
public BoatsGenericStorage(int pictureWidth, int pictureHeight)
{
- _boatStorages = new Dictionary>();
+ _boatStorages = new Dictionary>();
_pictureWidth = pictureWidth;
_pictureHeight = pictureHeight;
}
@@ -97,12 +97,13 @@ namespace Sailboat.Generics
///
/// Путь и имя файла
/// true - сохранение прошло успешно, false - ошибка при сохранении данных
- public bool SaveData(string filename)
+ public void SaveData(string filename)
{
if (File.Exists(filename))
{
File.Delete(filename);
}
+
StringBuilder data = new();
foreach (KeyValuePair> record in _boatStorages)
{
@@ -112,73 +113,77 @@ namespace Sailboat.Generics
records.Append($"{elem?.GetDataForSave(_separatorForObject)}{_separatorRecords}");
}
data.AppendLine($"{record.Key}{_separatorForKeyValue}{records}");
+
}
if (data.Length == 0)
{
- return false;
+ throw new InvalidOperationException("Файл не найден, невалидная операция, нет данных для сохранения");
}
using (StreamWriter writer = new StreamWriter(filename))
{
- writer.Write($"PlaneStorage{Environment.NewLine}{data}");
+ writer.WriteLine("BoatStorage");
+ writer.Write(data.ToString());
}
- 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))
+ using (StreamReader reader = new StreamReader(filename))
{
- string str = fs.ReadLine();
- if (str == null || str.Length == 0)
+ string checker = reader.ReadLine();
+ if (checker == null)
+ throw new NullReferenceException("Нет данных для загрузки");
+ if (!checker.StartsWith("BoatStorage"))
{
- return false;
- }
- if (!str.StartsWith("BoatStorage"))
- {
- return false;
+ //если нет такой записи, то это не те данные
+ throw new FormatException("Неверный формат данных");
}
_boatStorages.Clear();
- string strs = "";
-
- while ((strs = fs.ReadLine()) != null)
+ string strs;
+ bool firstinit = true;
+ while ((strs = reader.ReadLine()) != null)
{
+ if (strs == null && firstinit)
+ throw new NullReferenceException("Нет данных для загрузки");
if (strs == null)
- {
- return false;
- }
-
- string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
- if (record.Length != 2)
- {
- continue;
- }
+ break;
+ firstinit = false;
+ string name = strs.Split('|')[0];
BoatsGenericCollection collection = new(_pictureWidth, _pictureHeight);
- string[] set = record[1].Split(_separatorRecords, StringSplitOptions.RemoveEmptyEntries);
- foreach (string elem in set)
+ foreach (string data in strs.Split('|')[1].Split(';'))
{
- DrawingBoat? boat = elem?.CreateDrawingBoat(_separatorForObject, _pictureWidth, _pictureHeight);
- if (boat != null)
+ DrawingBoat? vehicle = data?.CreateDrawingBoat(_separatorForObject, _pictureWidth, _pictureHeight);
+ if (vehicle != null)
{
- if (!(collection + boat))
+ try
{
- return false;
+ _ = collection + vehicle;
+ }
+ catch (BoatNotFoundException e)
+ {
+ throw e;
+ }
+ catch (StorageOverflowException e)
+ {
+ throw e;
}
}
}
- _boatStorages.Add(record[0], collection);
+ _boatStorages.Add(name, collection);
}
- return true;
}
}
+
}
}
diff --git a/Sailboat/Sailboat/FormBoatCollection.cs b/Sailboat/Sailboat/FormBoatCollection.cs
index 1aa637c..636bd03 100644
--- a/Sailboat/Sailboat/FormBoatCollection.cs
+++ b/Sailboat/Sailboat/FormBoatCollection.cs
@@ -7,34 +7,34 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+using Microsoft.Extensions.Logging;
using Sailboat.DrawingObjects;
using Sailboat.Generics;
using Sailboat.MovementStrategy;
-
+using Sailboat.Exceptions;
namespace Sailboat
{
public partial class FormBoatCollection : Form
{
private readonly BoatsGenericStorage _storage;
- public FormBoatCollection()
+ private readonly ILogger _logger;
+ public FormBoatCollection(ILogger logger)
{
InitializeComponent();
_storage = new BoatsGenericStorage(pictureBoxCollection.Width, pictureBoxCollection.Height);
-
+ _logger = logger;
}
private void ReloadObjects()
{
int index = listBoxStorages.SelectedIndex;
listBoxStorages.Items.Clear();
-
for (int i = 0; i < _storage.Keys.Count; i++)
{
listBoxStorages.Items.Add(_storage.Keys[i]);
}
-
if (listBoxStorages.Items.Count > 0 && (index == -1 || index
>= listBoxStorages.Items.Count))
{
@@ -60,8 +60,8 @@ namespace Sailboat
}
var formBoatConfig = new FormBoatConfig();
- formBoatConfig.AddEvent(AddBoat);
formBoatConfig.Show();
+ formBoatConfig.AddEvent(AddBoat);
}
private void AddBoat(DrawingBoat drawingBoat)
@@ -70,21 +70,26 @@ namespace Sailboat
{
return;
}
- var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
- string.Empty];
+ var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
if (obj == null)
{
+ _logger.LogWarning("Добавление пустого объекта");
return;
}
-
- if (obj + drawingBoat)
+ try
{
- MessageBox.Show("Объект добавлен");
- pictureBoxCollection.Image = obj.ShowBoats();
+ if (obj + drawingBoat)
+ {
+ MessageBox.Show("Объект добавлен");
+ pictureBoxCollection.Image = obj.ShowBoats();
+ _logger.LogInformation($"Добавлен объект {obj}");
+ }
}
- else
+ catch (StorageOverflowException ex)
{
+ MessageBox.Show(ex.Message);
MessageBox.Show("Не удалось добавить объект");
+ _logger.LogWarning($"{ex.Message} в наборе {listBoxStorages.SelectedItem.ToString()}");
}
}
@@ -92,30 +97,41 @@ namespace Sailboat
{
if (listBoxStorages.SelectedIndex == -1)
{
+ _logger.LogWarning("Удаление объекта из несуществующего набора");
return;
}
- var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
- string.Empty];
+ var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
if (obj == null)
{
return;
}
- if (MessageBox.Show("Удалить объект?", "Удаление",
- MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
+ _logger.LogWarning("Отмена удаления объекта");
return;
}
int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
- if (obj - pos != null)
+ try
{
- MessageBox.Show("Объект удален");
- pictureBoxCollection.Image = obj.ShowBoats();
+ if (obj - pos != null)
+ {
+ MessageBox.Show("Объект удален");
+ _logger.LogInformation($"Удален объект с позиции{pos}");
+ pictureBoxCollection.Image = obj.ShowBoats();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось удалить объект");
+ _logger.LogWarning($"Не удалось удалить объект из набора {listBoxStorages.SelectedItem.ToString()}");
+ }
}
- else
+ catch (BoatNotFoundException ex)
{
- MessageBox.Show("Не удалось удалить объект");
+ MessageBox.Show(ex.Message);
+ _logger.LogWarning($"{ex.Message} из набора {listBoxStorages.SelectedItem.ToString()}");
}
+
}
private void buttonRefreshCollection_Click(object sender, EventArgs e)
@@ -138,47 +154,52 @@ namespace Sailboat
{
if (string.IsNullOrEmpty(textBoxStorageName.Text))
{
- MessageBox.Show("Не все данные заполнены", "Ошибка",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ _logger.LogWarning("Коллекция не добавлена, не все данные заполнены");
return;
}
_storage.AddSet(textBoxStorageName.Text);
ReloadObjects();
+
+ _logger.LogInformation($"Добавлен набор: {textBoxStorageName.Text}");
}
private void ListBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
{
- pictureBoxCollection.Image =
- _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowBoats();
+ pictureBoxCollection.Image = _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowBoats();
}
private void buttonDelObject_Click(object sender, EventArgs e)
{
if (listBoxStorages.SelectedIndex == -1)
{
+ _logger.LogWarning("Удаление невыбранного набора");
return;
}
- if (MessageBox.Show($"Удалить объект { listBoxStorages.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+ string name = listBoxStorages.SelectedItem.ToString() ?? string.Empty;
+ if (MessageBox.Show($"Удалить объект {name}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
- _storage.DelSet(listBoxStorages.SelectedItem.ToString()
- ?? string.Empty);
+ _storage.DelSet(name);
ReloadObjects();
+ _logger.LogInformation($"Удален набор: {name}");
}
+ _logger.LogWarning("Отмена удаления набора");
}
private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
{
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
- if (_storage.SaveData(saveFileDialog.FileName))
+ try
{
- MessageBox.Show("Сохранение прошло успешно",
- "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ _storage.SaveData(saveFileDialog.FileName);
+ MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ _logger.LogInformation($"Данные загружены в файл {saveFileDialog.FileName}");
}
- else
+ catch (Exception ex)
{
- MessageBox.Show("Не сохранилось", "Результат",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ _logger.LogWarning($"Не удалось сохранить информацию в файл: {ex.Message}");
}
}
}
@@ -187,18 +208,19 @@ namespace Sailboat
{
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
- if (_storage.LoadData(openFileDialog.FileName))
+ try
{
- MessageBox.Show("Загрузка прошла успешно",
- "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ _storage.LoadData(openFileDialog.FileName);
+ ReloadObjects();
+ MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ _logger.LogInformation($"Данные загружены из файла {openFileDialog.FileName}");
}
- else
+ catch (Exception ex)
{
- MessageBox.Show("Не загрузилось", "Результат",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ _logger.LogWarning($"Не удалось загрузить информацию из файла: {ex.Message}");
}
}
- ReloadObjects();
}
}
diff --git a/Sailboat/Sailboat/Program.cs b/Sailboat/Sailboat/Program.cs
index fac24ad..4e9c193 100644
--- a/Sailboat/Sailboat/Program.cs
+++ b/Sailboat/Sailboat/Program.cs
@@ -1,3 +1,8 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
namespace Sailboat
{
internal static class Program
@@ -8,10 +13,31 @@ namespace Sailboat
[STAThread]
static void Main()
{
- // To customize application configuration such as set high DPI settings or default font,
- // see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormBoatCollection());
+ 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 =>
+ {
+ 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}appSetting.json", optional: false, reloadOnChange: true).Build();
+ var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
+
+ option.SetMinimumLevel(LogLevel.Information);
+ option.AddSerilog(logger);
+ });
}
}
}
\ No newline at end of file
diff --git a/Sailboat/Sailboat/Sailboat.csproj b/Sailboat/Sailboat/Sailboat.csproj
index 13ee123..b28931e 100644
--- a/Sailboat/Sailboat/Sailboat.csproj
+++ b/Sailboat/Sailboat/Sailboat.csproj
@@ -8,6 +8,15 @@
enable
+
+
+
+
+
+
+
+
+
True
diff --git a/Sailboat/Sailboat/SetGeneric.cs b/Sailboat/Sailboat/SetGeneric.cs
index c5bd178..05134f9 100644
--- a/Sailboat/Sailboat/SetGeneric.cs
+++ b/Sailboat/Sailboat/SetGeneric.cs
@@ -4,6 +4,8 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Sailboat.Exceptions;
+
namespace Sailboat.Generics
{
internal class SetGeneric where T : class
@@ -51,10 +53,12 @@ namespace Sailboat.Generics
///
public bool Insert(T boat, int position)
{
- if (!(position >= 0 && position <= Count && _places.Count < _maxCount)) {
- return false;
- }
- _places.Insert(position, boat);
+ if (position < 0 || position >= _maxCount)
+ throw new BoatNotFoundException(position);
+
+ if (_places.Count >= _maxCount)
+ throw new StorageOverflowException(_maxCount);
+ _places.Insert(0, boat);
return true;
}
///
@@ -64,10 +68,9 @@ namespace Sailboat.Generics
///
public bool Remove(int position)
{
- if (position < 0 || position >= Count)
- {
- return false;
- }
+ if (position < 0 || position > _maxCount || position >= Count)
+ throw new BoatNotFoundException(position);
+
_places.RemoveAt(position);
return true;
}
diff --git a/Sailboat/Sailboat/StorageOverflowException.cs b/Sailboat/Sailboat/StorageOverflowException.cs
new file mode 100644
index 0000000..45f3ebb
--- /dev/null
+++ b/Sailboat/Sailboat/StorageOverflowException.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Sailboat.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/Sailboat/Sailboat/appSetting.json b/Sailboat/Sailboat/appSetting.json
new file mode 100644
index 0000000..38552ff
--- /dev/null
+++ b/Sailboat/Sailboat/appSetting.json
@@ -0,0 +1,20 @@
+{
+ "Serilog": {
+ "Using": [ "Serilog.Sinks.File" ],
+ "MinimumLevel": "Information",
+ "WriteTo": [
+ {
+ "Name": "File",
+ "Args": {
+ "path": "Logs/log_.log",
+ "rollingInterval": "Day",
+ "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+ }
+ }
+ ],
+ "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
+ "Properties": {
+ "Application": "Sailboat"
+ }
+ }
+}
\ No newline at end of file