bekodeg/PIbd_22_Borovkov_M_V_ElectricLocomotive_base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

доработка по требованиям

Browse Source
This commit is contained in:
bekodeg 2023-12-06 09:33:39 +04:00
parent 23a7a41196
commit ce2f998244
5 changed files with 61 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElectricLocomotive/Generics/LocomotivesGenericStorage.cs
View File

@ -133,7 +133,7 @@ namespace ProjectElectricLocomotive.Generics
}
if (data.Length == 0)
{
throw new Exception("Невалиданя операция, нет данных длясохранения");
throw new InvalidOperationException("Невалиданя операция, нет данных длясохранения");
}
using FileStream fs = new(filename, FileMode.Create);
byte[] info = new

13
ElectricLocomotive/LogicFormLocomotiveCollection.cs
View File

@ -2,6 +2,7 @@
using ProjectElectricLocomotive.DrawningObjects;
using ProjectElectricLocomotive.Exceptions;
using ProjectElectricLocomotive.Generics;
using System.Windows.Forms;
using System.Xml.Linq;
namespace ProjectElectricLocomotive
@ -133,15 +134,18 @@ namespace ProjectElectricLocomotive
MessageBox.Show("Объект добавлен");
pictureBoxCollection.Image = obj.ShowLocomotives();
_logger.LogInformation($"Объект {obj.GetType()} добавлен");
}
else
{
MessageBox.Show("Не удалось добавить объект");
_logger.LogInformation($"Не удалось добавить объект");
}
}
catch (StorageOverflowException ex)
{
MessageBox.Show(ex.Message);
_logger.LogError(ex.ToString());
}
}
@ -182,15 +186,18 @@ namespace ProjectElectricLocomotive
{
MessageBox.Show("Объект удален");
pictureBoxCollection.Image = obj.ShowLocomotives();
_logger.LogInformation($"Объект {pos} удален");
}
else
{
MessageBox.Show("Не удалось удалить объект");
_logger.LogInformation($"Не удалось удалить объект {pos}");
}
}
catch (LocomotiveNotFoundException ex)
{
MessageBox.Show(ex.Message);
_logger.LogError(ex.ToString());
}
}
/// <summary>
@ -228,11 +235,14 @@ namespace ProjectElectricLocomotive
_storage.SaveData(saveFileDialog.FileName);
MessageBox.Show("Сохранение прошло успешно", "Результат",
MessageBoxButtons.OK, MessageBoxIcon.Error);
_logger.LogInformation($"Сохранение в {saveFileDialog.FileName} прошло успешно");
}
catch (Exception ex)
{
MessageBox.Show($"Не сохранилось: {ex.Message}",
"Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
_logger.LogInformation($"Не удалось сохранить в {saveFileDialog.FileName}: {ex.Message}");
_logger.LogDebug(ex.ToString());
}
}
}
@ -250,11 +260,14 @@ namespace ProjectElectricLocomotive
MessageBox.Show("Загрузка прошла успешно", "Результат",
MessageBoxButtons.OK, MessageBoxIcon.Error);
ReloadObjects();
_logger.LogInformation($"Загрузка из {openFileDialog.FileName} прошла успешно");
}
catch(Exception ex)
{
MessageBox.Show($"Не загрузилось: {ex.Message}",
"Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
_logger.LogInformation($"Не удалось загрузить из {openFileDialog.FileName}: {ex.Message}");
_logger.LogDebug(ex.ToString());
}
}
}

23
ElectricLocomotive/Program.cs
View File

@ -1,6 +1,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
using Serilog;
namespace ProjectElectricLocomotive
{
@ -12,8 +13,7 @@ namespace ProjectElectricLocomotive
[STAThread]
static void Main()
{
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
var services = new ServiceCollection();
ConfigureServices(services);
@ -21,14 +21,29 @@ namespace ProjectElectricLocomotive
{
Application.Run(serviceProvider.GetRequiredService<FormLocomotiveCollection>());
}
}
private static void ConfigureServices(ServiceCollection services)
{
services.AddSingleton<FormLocomotiveCollection>().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}serilog.json", optional: false, reloadOnChange: true
).Build();
var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
option.SetMinimumLevel(LogLevel.Information);
option.AddNLog("nlog.config");
option.AddSerilog(logger);
});
}
}
}

8
ElectricLocomotive/ProjectElectricLocomotive.csproj
View File

@ -9,8 +9,16 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.5" />
<PackageReference Include="Serilog" Version="3.1.2-dev-02097" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1-dev-00561" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00968" />
</ItemGroup>
<ItemGroup>

20
ElectricLocomotive/serilog.json Normal file
View File

@ -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": "GasolineTanker"
}
}
}