diff --git a/AirBomber/AirBomber/AirBomber.csproj b/AirBomber/AirBomber/AirBomber.csproj
index 13ee123..9f835ae 100644
--- a/AirBomber/AirBomber/AirBomber.csproj
+++ b/AirBomber/AirBomber/AirBomber.csproj
@@ -8,6 +8,29 @@
enable
+
+
+
+
+
+
+ Always
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
True
diff --git a/AirBomber/AirBomber/AirBomberNotFoundException.cs b/AirBomber/AirBomber/AirBomberNotFoundException.cs
new file mode 100644
index 0000000..9ff6925
--- /dev/null
+++ b/AirBomber/AirBomber/AirBomberNotFoundException.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 AirBomber
+{
+ [Serializable]
+ internal class AirBomberNotFoundException : ApplicationException
+ {
+ public AirBomberNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
+ public AirBomberNotFoundException() : base() { }
+ public AirBomberNotFoundException(string message) : base(message) { }
+ public AirBomberNotFoundException(string message, Exception exception) : base(message, exception) { }
+ protected AirBomberNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+ }
+}
diff --git a/AirBomber/AirBomber/FormMapWithSetAirBombers.cs b/AirBomber/AirBomber/FormMapWithSetAirBombers.cs
index e9d7648..fc51939 100644
--- a/AirBomber/AirBomber/FormMapWithSetAirBombers.cs
+++ b/AirBomber/AirBomber/FormMapWithSetAirBombers.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -29,17 +30,44 @@ namespace AirBomber
private Action AddAction;
- public FormMapWithSetAirBombers()
+ private readonly ILogger _logger;
+
+ public FormMapWithSetAirBombers(ILogger logger)
{
InitializeComponent();
+ _logger = logger;
_mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
comboBoxSelectorMap.Items.Clear();
foreach (var elem in _mapsDict)
{
comboBoxSelectorMap.Items.Add(elem.Key);
}
- AddAction = airBomber => { _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].add(new DrawingObjectAirBomber(airBomber));
- pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();};
+ AddAction = addAirBomber;
+ }
+
+ private void addAirBomber(DrawingAirBomber airBomber)
+ {
+ try
+ {
+ int res = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawingObjectAirBomber(airBomber);
+ pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+ _logger.LogInformation($"Добавлен объект {airBomber.ToString()}");
+ }
+ catch (ArgumentNullException ex)
+ {
+ MessageBox.Show(ex.Message);
+ _logger.LogWarning($"Ошибка: {ex.Message}");
+ }
+ catch (StorageOverflowException ex)
+ {
+ MessageBox.Show(ex.Message);
+ _logger.LogWarning($"Ошибка: {ex.Message}");
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show($"Неизвестная ошибка: {ex.Message}", "Ошибка!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ _logger.LogWarning($"Ошибка: {ex.Message}");
+ }
}
private void buttonAddAirBomber_Click(object sender, EventArgs e)
@@ -68,14 +96,22 @@ namespace AirBomber
return;
}
int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
- if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+ try
{
+ IDrawingObject drawingObject = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos;
MessageBox.Show("Объект удален");
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+ _logger.LogInformation($"Удалён объект {drawingObject.ToString()}");
}
- else
+ catch (AirBomberNotFoundException ex)
{
- MessageBox.Show("Не удалось удалить объект");
+ MessageBox.Show($"Ошибка удаления: {ex.Message}", "Ошибка!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ _logger.LogWarning($"Ошибка: {ex.Message}");
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show($"Неизвестная ошибка: {ex.Message}", "Ошибка!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ _logger.LogWarning($"Ошибка: {ex.Message}");
}
}
@@ -159,11 +195,13 @@ namespace AirBomber
}
_mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
ReloadMaps();
+ _logger.LogInformation($"Добавлена карта: {textBoxNewMapName.Text}, тип карты: {comboBoxSelectorMap.Text}");
}
private void listBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
{
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+ _logger.LogInformation($"Переход на карту {listBoxMaps.SelectedItem?.ToString() ?? string.Empty}");
}
private void buttonDeleteMap_Click(object sender, EventArgs e)
@@ -172,24 +210,29 @@ namespace AirBomber
{
return;
}
+ string mapName = listBoxMaps.SelectedItem?.ToString();
if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
_mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
ReloadMaps();
}
+ _logger.LogInformation($"Удалена карта {mapName}");
}
private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
{
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
- if (_mapsCollection.SaveData(saveFileDialog.FileName))
+ try
{
+ _mapsCollection.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.Error);
+ _logger.LogWarning($"Ошибка: {ex.Message}");
}
}
}
@@ -198,14 +241,27 @@ namespace AirBomber
{
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
- if (_mapsCollection.LoadData(openFileDialog.FileName))
+ try
{
+ _mapsCollection.LoadData(openFileDialog.FileName);
MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
ReloadMaps();
+ _logger.LogInformation($"Данные загружены из файла {openFileDialog.FileName}");
}
- else
+ catch(FileFormatException ex)
{
- MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ _logger.LogWarning($"Ошибка: {ex.Message}");
+ }
+ catch(FileNotFoundException ex)
+ {
+ MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ _logger.LogWarning($"Ошибка: {ex.Message}");
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show($"Неизвестная ошибка: {ex.Message}", "Ошибка!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ _logger.LogWarning($"Ошибка: {ex.Message}");
}
}
}
diff --git a/AirBomber/AirBomber/MapsCollection.cs b/AirBomber/AirBomber/MapsCollection.cs
index b33ff80..a11452a 100644
--- a/AirBomber/AirBomber/MapsCollection.cs
+++ b/AirBomber/AirBomber/MapsCollection.cs
@@ -87,7 +87,7 @@ namespace AirBomber
///
/// Путь и имя файла
///
- public bool SaveData(string filename)
+ public void SaveData(string filename)
{
if (File.Exists(filename))
{
@@ -102,7 +102,6 @@ namespace AirBomber
sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}", sw);
}
}
- return true;
}
///
@@ -110,11 +109,11 @@ namespace AirBomber
///
///
///
- public bool LoadData(string filename)
+ public void LoadData(string filename)
{
if (!File.Exists(filename))
{
- return false;
+ throw new FileNotFoundException("Файл не найден");
}
using (FileStream fs = new(filename, FileMode.Open))
using (StreamReader sr = new StreamReader(fs))
@@ -122,7 +121,7 @@ namespace AirBomber
string line;
line = sr.ReadLine();
line.Trim();
- if (line != "MapsCollection") return false;
+ if (line != "MapsCollection") throw new FileFormatException("Неверный формат файла");
_mapStorages.Clear();
while ((line = sr.ReadLine()) != null)
{
@@ -145,7 +144,6 @@ namespace AirBomber
_mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
}
}
- return true;
}
}
}
diff --git a/AirBomber/AirBomber/Program.cs b/AirBomber/AirBomber/Program.cs
index d75f7b1..17e4b78 100644
--- a/AirBomber/AirBomber/Program.cs
+++ b/AirBomber/AirBomber/Program.cs
@@ -1,3 +1,10 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualBasic.Logging;
+using Serilog;
+using System;
+
namespace AirBomber
{
internal static class Program
@@ -11,7 +18,27 @@ namespace AirBomber
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormMapWithSetAirBombers());
+ 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/AirBomber/AirBomber/SetAirBombersGeneric.cs b/AirBomber/AirBomber/SetAirBombersGeneric.cs
index a743086..f494dd8 100644
--- a/AirBomber/AirBomber/SetAirBombersGeneric.cs
+++ b/AirBomber/AirBomber/SetAirBombersGeneric.cs
@@ -36,7 +36,14 @@ namespace AirBomber
///
public int Insert(T airBomber)
{
- if (_places.Count + 1 >= _maxCount) return -1;
+ if (airBomber == null)
+ {
+ throw new ArgumentNullException();
+ }
+ if (_places.Count + 1 > _maxCount)
+ {
+ throw new StorageOverflowException(_maxCount);
+ }
_places.Insert(0, airBomber);
return 0;
}
@@ -48,8 +55,14 @@ namespace AirBomber
///
public int Insert(T airBomber, int position)
{
- if (position < 0 || position >= _maxCount) return -1;
- if (_places.Count + 1 >= _maxCount) return -1;
+ if (position < 0 || position >= _maxCount)
+ {
+ throw new AirBomberNotFoundException(position);
+ }
+ if (_places.Count + 1 >= _maxCount)
+ {
+ throw new StorageOverflowException(_maxCount);
+ }
_places.Insert(position, airBomber);
return position;
}
@@ -60,7 +73,10 @@ namespace AirBomber
///
public T Remove(int position)
{
- if (position < 0 || position >= _maxCount) return null;
+ if (position < 0 || position >= _maxCount)
+ {
+ throw new AirBomberNotFoundException(position);
+ }
T removedObject = _places[position];
_places.RemoveAt(position);
return removedObject;
diff --git a/AirBomber/AirBomber/StorageOverflowException.cs b/AirBomber/AirBomber/StorageOverflowException.cs
new file mode 100644
index 0000000..a3fa037
--- /dev/null
+++ b/AirBomber/AirBomber/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 AirBomber
+{
+ [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/AirBomber/AirBomber/appsettings.json b/AirBomber/AirBomber/appsettings.json
new file mode 100644
index 0000000..d2acb30
--- /dev/null
+++ b/AirBomber/AirBomber/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.log" }
+ }
+ ],
+ "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
+ "Properties": {
+ "Application": "Sample"
+ }
+ }
+}
\ No newline at end of file