Igor_Gordeev/ISEbd-21.Gordeev.I.V.ElectricLocomotive.Basic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

problems AddLogging in Program.cs

Browse Source
This commit is contained in:
Игорь Гордеев 2023-12-13 20:15:31 +04:00
parent f7bd75416a
commit 3c0b05bfc7
8 changed files with 184 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ElectricLocomotive/ElectricLocomotive/ElectricLocomotive.csproj
View File

@ -8,6 +8,11 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>

68
ElectricLocomotive/ElectricLocomotive/FormLocomotiveCollection.cs
View File

@ -1,5 +1,8 @@
using ElectricLocomotive.DrawningObject;
using ElectricLocomotive.Generics;
using Microsoft.Extensions.Logging;
using ProjectElectricLocomotive;
using ProjectElectricLocomotive.Exceptions;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -16,10 +19,15 @@ namespace ElectricLocomotive
{
private readonly LocomotiveGenericStorage _storage;
public FormLocomotiveCollection()
/// <summary>
/// Логер
/// </summary>
private readonly ILogger _logger;
public FormLocomotiveCollection(ILogger<FormLocomotiveCollection> logger)
{
InitializeComponent();
_storage = new LocomotiveGenericStorage(CollectionPictureBox.Width, CollectionPictureBox.Height);
_logger = logger;
}
/// <summary>
@ -49,10 +57,13 @@ namespace ElectricLocomotive
if (string.IsNullOrEmpty(textBoxStorageName.Text))
{
MessageBox.Show("Не всё заполнено", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
_logger.LogWarning("Неудачная попытка. Коллекция не добавлена, не все данные заполнены");
return;
}
_storage.AddSet(textBoxStorageName.Text);
ReloadObjects();
_logger.LogInformation($"Добавлен набор: {textBoxStorageName.Text}");
}
private void listBoxStorage_SelectedIndexChanged(object sender, EventArgs e)
@ -66,12 +77,15 @@ namespace ElectricLocomotive
{
return;
}
string name = listBoxStorage.SelectedItem.ToString() ?? string.Empty;
if (MessageBox.Show($"Удалить объект {listBoxStorage.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo,
MessageBoxIcon.Question) == DialogResult.Yes)
{
_storage.DelSet(listBoxStorage.SelectedItem.ToString() ?? string.Empty);
_storage.DelSet(name);
ReloadObjects();
_logger.LogInformation($"Набор '{name}' удален");
}
_logger.LogWarning("Отмена удаления набора");
}
private void ButtonAddLocomotive_Click(object sender, EventArgs e)
@ -92,18 +106,27 @@ namespace ElectricLocomotive
{
return;
}
//проверяем, удалось ли нам загрузить объект
try
{
if (obj + loco > -1)
{
MessageBox.Show("Объект добавлен");
CollectionPictureBox.Image = obj.ShowLocomotives();
_logger.LogInformation($"Добавлен объект {obj}");
;
}
else
{
MessageBox.Show("Не удалось добавить объект");
}
}
catch (StorageOverflowException ex)
{
MessageBox.Show(ex.Message);
}
//проверяем, удалось ли нам загрузить объект
}
private void ButtonRemoveLocomotive_Click(object sender, EventArgs e)
{
@ -116,12 +139,17 @@ namespace ElectricLocomotive
if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
_logger.LogWarning("Отмена удаления объекта");
return;
}
int pos = Convert.ToInt32(Input.Text);
if (obj - pos != null)
try
{
var removeObj = obj - pos;
if (removeObj != null)
{
MessageBox.Show("Объект удален");
_logger.LogInformation($"Удален объект с позиции{pos}");
CollectionPictureBox.Image = obj.ShowLocomotives();
}
else
@ -129,6 +157,12 @@ namespace ElectricLocomotive
MessageBox.Show("Не удалось удалить объект");
}
}
catch (LocoNotFoundException ex)
{
MessageBox.Show(ex.Message);
_logger.LogWarning($"Не найден объект по позиции: {obj}");
}
}
private void ButtonRefreshCollection_Click(object sender, EventArgs e)
{
@ -150,15 +184,15 @@ namespace ElectricLocomotive
{
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
if (_storage.SaveData(saveFileDialog.FileName))
try
{
MessageBox.Show("Сохранение прошло успешно!",
"Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
_storage.SaveData(saveFileDialog.FileName);
_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}");
}
}
}
@ -169,17 +203,19 @@ namespace ElectricLocomotive
/// <param name="e"></param>
private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
{
// TODO продумать логику
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
if (_storage.LoadData(openFileDialog.FileName))
try
{
MessageBox.Show("Загрузка завершена!", "Result", MessageBoxButtons.OK, MessageBoxIcon.Information);
_storage.LoadData(openFileDialog.FileName);
_logger.LogInformation($"Данные загружены из файла {openFileDialog.FileName}");
ReloadObjects();
}
else
catch (Exception ex)
{
MessageBox.Show("Ошибка загрузки!", "Result", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
_logger.LogWarning($"Не удалось загрузить информацию из файла: {ex.Message}");
}
}
}

21
ElectricLocomotive/ElectricLocomotive/LocoNotFoundException.cs Normal file
View File

@ -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 ProjectElectricLocomotive.Exceptions
{
[Serializable]
internal class LocoNotFoundException : ApplicationException
{
public LocoNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
public LocoNotFoundException() : base() { }
public LocoNotFoundException(string message) : base(message) { }
public LocoNotFoundException(string message, Exception exception) : base(message, exception) { }
protected LocoNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
}
}

28
ElectricLocomotive/ElectricLocomotive/LocomotiveGenericStorage.cs
View File

@ -97,7 +97,7 @@ namespace ElectricLocomotive.Generics
/// </summary>
/// <param name="filename">Путь и имя файла</param>
/// <returns>true - сохранение прошло успешно, false - ошибка при сохранении данных</returns>
public bool SaveData(string filename)
public void SaveData(string filename)
{
if (File.Exists(filename))
{
@ -115,53 +115,47 @@ namespace ElectricLocomotive.Generics
}
if (data.Length == 0)
{
return false;
throw new Exception("Нет данных для записи, ошибка");
}
using StreamWriter fs = new StreamWriter(filename);
{
fs.WriteLine($"LocomotiveStorage{Environment.NewLine}");
fs.WriteLine(data);
}
return true;
return;
}
/// <summary>
/// Загрузка информации по автомобилям в хранилище из файла
/// </summary>
/// <param name="filename">Путь и имя файла</param>
/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
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))
{
string str = fs.ReadLine();
if (str == null || str.Length == 0)
{
return false;
throw new IOException("Нет данных для загрузки");
}
if (!str.StartsWith("LocomotiveStorage"))
{
//если нет такой записи, то это не те данные
return false;
throw new FileFormatException("Неверный формат данных");
}
_locomotivesStorage.Clear();
string strs = "";
while ((strs = fs.ReadLine()) != null)
{
if (strs == null)
{
return false;
throw new FileNotFoundException("Нет данных для загрузки");
}
string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
@ -176,15 +170,15 @@ namespace ElectricLocomotive.Generics
DrawningLocomotive? loco = elem?.CreateDrawningLocomotive(_separatorForObject, _pictureWidth, _pictureHeight);
if (loco != null)
{
if ((collection + loco) == -1)
if ((collection + loco) == -1) // for my realization it's -1, for eegov's realization it's boolean
{
return false;
throw new Exception("Ошибка добавления ");
}
}
}
_locomotivesStorage.Add(record[0], collection);
}
return true;
return;
}
}
}

33
ElectricLocomotive/ElectricLocomotive/Program.cs
View File

@ -1,19 +1,42 @@
using ProjectElectricLocomotive;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
namespace ElectricLocomotive
{
internal static class Program
{
/// <summary>
/// The main entry point for the application.
/// </summary>
[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 FormLocomotiveCollection());
var services = new ServiceCollection();
ConfigureServices(services);
using (ServiceProvider serviceProvider = services.BuildServiceProvider())
{
Application.Run(serviceProvider.GetRequiredService<FormLocomotiveCollection>());
}
}
private static void ConfigureServices(ServiceCollection services)
{
services.AddSingleton<FormLocomotiveCollection>().AddLoggging(option =>//òðàáëû ñ Addlogging
{
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();
var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
option.SetMinimumLevel(LogLevel.Information);
option.AddSerilog(logger);
});
}
}
}

21
ElectricLocomotive/ElectricLocomotive/StorageOverflowException.cs Normal file
View File

@ -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 ProjectElectricLocomotive
{
[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) { }
}
}

20
ElectricLocomotive/ElectricLocomotive/appSettings.json Normal file
View File

@ -0,0 +1,20 @@
{
"Serilog": {
"Using": [ "Serilog.Sinks.File" ],
"MinimumLevel": "Information",
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log_.log",
"rollingInterval": "Day",
"outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
}
}
],
"Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
"Properties": {
"Application": "Locomotives"
}
}
}

14
ElectricLocomotive/ElectricLocomotive/nlog.config Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
autoReload="true" internalLogLevel="Info">
<targets>
<target xsi:type="File" name="tofile" fileName="locolog-${shortdate}.log" />
</targets>
<rules>
<logger name="*" minlevel="Debug" writeTo="tofile" />
</rules>
</nlog>
</configuration>